Marc-André Moreau 2a5192b027 Merge branch 'master' of github.com:awakecoding/FreeRDP into egfx
Conflicts:
	client/Windows/wf_cliprdr.h
	client/Windows/wf_event.h
	client/X11/xf_client.c
	client/X11/xf_gdi.c
	libfreerdp/gdi/gdi.c
	server/Mac/mf_input.c
2014-09-17 19:09:56 -04:00
..
2014-07-20 00:52:35 -04:00
2014-07-20 00:52:35 -04:00
2014-07-20 00:52:35 -04:00
2014-07-20 00:52:35 -04:00
2014-09-13 12:02:53 -04:00
2013-03-11 12:14:44 -04:00
2013-03-11 12:14:44 -04:00
2014-07-20 00:52:35 -04:00