Merge branch 'master' of github.com:FreeRDP/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 16 Mar 2016 00:19:15 +0000 (20:19 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Wed, 16 Mar 2016 00:19:15 +0000 (20:19 -0400)
commit9211f44e46f83ba3a1f621d7f452e6a9e1a30c81
tree6c0abdee463accc987667096daf9e8b175626d3b
parent3cbd7c08f773bd11159a0e7f748d50ae779a8783
parentb35f3062f37684aec41b648442c7a3e087ec8a08
Merge branch 'master' of github.com:FreeRDP/FreeRDP
libfreerdp/core/freerdp.c
winpr/libwinpr/path/shell.c
winpr/libwinpr/utils/wlog/wlog.c