Marc-André Moreau f1bd547580 Merge branch 'master' of github.com:FreeRDP/FreeRDP ... Conflicts: client/X11/xf_client.c		2014-12-15 15:55:51 -05:00
..
Android	Standard RDP Security Layer Levels/Method Overhaul	2014-12-12 02:17:12 +01:00
DirectFB	Fixed compiler warnings.	2014-09-15 08:55:00 +02:00
Mac	Mac: set policy to silent cmake >= 3.0 warnings	2014-12-12 19:25:43 +01:00
Sample	freerdp: remove deprecated eventing system	2014-11-12 13:18:18 -05:00
Wayland	wlfreerdp: add keyboard and mouse wheel support, fix bugs	2014-11-26 10:46:05 +01:00
Windows	Replaced fprintf error messages with WLog.	2014-11-16 12:21:38 +01:00
X11	Merge branch 'master' of github.com:FreeRDP/FreeRDP	2014-12-15 15:55:51 -05:00
common	Merge pull request #2275 from awakecoding/master	2014-12-12 09:33:52 -05:00
iOS	Standard RDP Security Layer Levels/Method Overhaul	2014-12-12 02:17:12 +01:00
.gitignore	freerdp: remove vendor-specific options from build system, add automatic ways of including external clients/servers	2013-09-03 20:37:04 -04:00
CMakeLists.txt	build: cmake 3.1 compatibility	2014-12-12 19:26:22 +01:00