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

..

Android

Using wlog for logging in clients now.

2014-09-15 08:55:00 +02:00

common

command line: fix --version

2014-09-16 22:51:01 +02:00

DirectFB

Fixed compiler warnings.

2014-09-15 08:55:00 +02:00

iOS

libfreerdp: always build "MONOLITHIC"

2014-09-12 00:19:53 +02:00

Mac

Merge branch 'master' of github.com:awakecoding/FreeRDP into egfx

2014-09-17 19:09:56 -04:00

Sample

Using wlog for logging in clients now.

2014-09-15 08:55:00 +02:00

Windows

Merge branch 'master' of github.com:awakecoding/FreeRDP into egfx

2014-09-17 19:09:56 -04:00

X11

Merge branch 'master' of github.com:awakecoding/FreeRDP into egfx

2014-09-17 19:09:56 -04:00

.gitignore

…

CMakeLists.txt

…