Marc-André Moreau 78e00db45d Merge branch 'egfx' of github.com:awakecoding/FreeRDP into egfx ... Conflicts: libfreerdp/codec/test/TestFreeRDPCodecClear.c		2014-07-01 09:11:50 -04:00
..
Android	Merge pull request #1927 from akallabeth/android-de-translation	2014-06-27 12:35:26 +02:00
common	channels/remdesk: initial working Remote Assistance	2014-06-30 13:26:11 -04:00
DirectFB	channels: cleanup unused freerdp channels global functions	2014-06-11 16:27:31 -04:00
iOS	channels: cleanup unused freerdp channels global functions	2014-06-11 16:27:31 -04:00
Mac	channels: cleanup unused freerdp channels global functions	2014-06-11 16:27:31 -04:00
Sample	channels: cleanup unused freerdp channels global functions	2014-06-11 16:27:31 -04:00
Windows	channels: cleanup unused freerdp channels global functions	2014-06-11 16:27:31 -04:00
X11	Merge branch 'egfx' of github.com:awakecoding/FreeRDP into egfx	2014-07-01 09:11:50 -04: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	freerdp: add more vendor options	2014-05-09 12:25:05 -04:00