Marc-André Moreau d102e746c8 Merge branch 'awakecoding' of github.com:vworkspace/FreeRDP
Conflicts:
	libfreerdp/core/license.c
	libfreerdp/core/nego.c
	winpr/libwinpr/synch/wait.c
2014-09-19 14:38:25 -04:00
..
2014-05-11 22:49:10 +02:00
2014-09-15 08:48:46 +02:00
2013-05-08 16:09:16 -04:00
2013-09-05 12:14:33 +02:00