Bernhard Miklautz afd0d2463f Merge branch 'master' into issue_698 ...

Conflicts:
	libfreerdp/utils/args.c

2012-08-23 20:15:14 +02:00

..

cache

…

channels

wfreerdp: fix compilation warnings on Windows

2012-08-14 18:39:07 -04:00

codec

libfreerdp: wrap inclusion of config.h with HAVE_CONFIG_H

2012-08-14 17:41:40 -04:00

core

wfreerdp: fix compilation warnings on Windows

2012-08-14 18:39:07 -04:00

crypto

Merge branch 'master' of git://github.com/FreeRDP/FreeRDP

2012-08-20 19:37:37 +01:00

gdi

libfreerdp: wrap inclusion of config.h with HAVE_CONFIG_H

2012-08-14 17:41:40 -04:00

locale

wfreerdp: fix compilation warnings on Windows

2012-08-14 18:39:07 -04:00

rail

libfreerdp: wrap inclusion of config.h with HAVE_CONFIG_H

2012-08-14 17:41:40 -04:00

utils

Merge branch 'master' into issue_698

2012-08-23 20:15:14 +02:00

CMakeLists.txt

include: fix installation of headers

2012-08-14 19:55:48 -04:00