Marc-André Moreau 43e9f6de58 Merge branch 'master' of github.com:awakecoding/FreeRDP into shadow
Conflicts:
	server/X11/CMakeLists.txt
2014-07-11 16:58:24 -04:00
..
2013-11-06 17:44:17 +01:00