Merge branch 'auto-detect' of github.com:vworkspace/FreeRDP
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Sat, 25 Jan 2014 22:08:43 +0000 (17:08 -0500)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Sat, 25 Jan 2014 22:08:43 +0000 (17:08 -0500)
commit6bd4362e6d36357062e5235beb254b70221ad930
tree712f71605292a785eee362b85f1ced440c571fb2
parent3782c2ad72ff050e7e11a5814cf75997f564fede
parent63f6947872b6dc3f42f38909735559b5e7c7f249
Merge branch 'auto-detect' of github.com:vworkspace/FreeRDP

Conflicts:
include/freerdp/settings.h
libfreerdp/core/gcc.c
libfreerdp/core/gcc.h
libfreerdp/core/mcs.h
libfreerdp/core/rdp.c
include/freerdp/settings.h
libfreerdp/core/gcc.c
libfreerdp/core/gcc.h
libfreerdp/core/mcs.h
libfreerdp/core/rdp.c