Merge branch 'awakecoding' of github.com:vworkspace/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 19 Sep 2014 18:38:25 +0000 (14:38 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 19 Sep 2014 18:38:25 +0000 (14:38 -0400)
commitd102e746c81dccb476ac599f1942e24f9fa03a26
tree3b392f83566c790b9284b1634073789d12e7ad6c
parentf7d21655fa2552c8813be9d2d5bac4bbaa5abf6a
parentad8268d05999840d4ee9c428de9b04dc6468aa92
Merge branch 'awakecoding' of github.com:vworkspace/FreeRDP

Conflicts:
libfreerdp/core/license.c
libfreerdp/core/nego.c
winpr/libwinpr/synch/wait.c
libfreerdp/core/capabilities.c
libfreerdp/core/connection.c
libfreerdp/core/license.c
libfreerdp/core/nego.c
libfreerdp/core/rdp.h
winpr/libwinpr/synch/wait.c