Marc-André Moreau 168d46f253 Merge branch 'awakecoding' of github.com:vworkspace/FreeRDP
Conflicts:
	libfreerdp/core/nego.c
	libfreerdp/core/peer.c
	winpr/libwinpr/synch/wait.c
2014-08-15 11:43:50 -04:00
..
2014-07-10 11:10:58 +02:00
2014-07-10 11:10:58 +02:00
2014-07-10 11:10:58 +02:00
2014-08-11 09:17:56 +02:00
2014-07-10 11:10:58 +02:00
2014-07-10 11:10:58 +02:00
2014-07-10 11:10:58 +02:00
2014-07-10 11:10:58 +02:00
2014-07-10 11:10:58 +02:00
2014-07-10 11:10:58 +02:00
2014-07-29 05:22:29 +02:00
2014-07-10 11:10:58 +02:00
2014-07-10 11:10:58 +02:00
2014-07-10 11:10:58 +02:00
2014-07-10 11:10:58 +02:00
2014-07-10 11:10:58 +02:00
2014-07-10 11:10:58 +02:00
2014-07-10 11:10:58 +02:00
2014-07-10 11:10:58 +02:00
2014-07-10 11:10:58 +02:00
2014-07-10 11:10:58 +02:00
2014-07-28 21:55:57 +02:00
2014-07-10 11:10:58 +02:00
2014-07-10 11:10:58 +02:00
2014-07-10 11:10:58 +02:00
2014-07-10 11:10:58 +02:00
2014-07-10 11:10:58 +02:00
2014-07-10 11:10:58 +02:00