Commit Graph

3712 Commits

Author SHA1 Message Date
Bernhard Miklautz
afd0d2463f Merge branch 'master' into issue_698
Conflicts:
	libfreerdp/utils/args.c
2012-08-23 20:15:14 +02:00
LawrenceK
28813f3779 Merge branch 'master' of git://github.com/FreeRDP/FreeRDP 2012-08-20 19:37:37 +01:00
Marc-André Moreau
e9936ddc96 cmake: merging with master 2012-08-14 20:21:00 -04:00
Marc-André Moreau
c5624ce58f include: fix installation of headers 2012-08-14 19:55:48 -04:00
Marc-André Moreau
9313bf12b4 wfreerdp: fix monolithic build on Windows 2012-08-14 19:04:45 -04:00
Marc-André Moreau
f1fa98c997 wfreerdp: fix compilation warnings on Windows 2012-08-14 18:39:07 -04:00
Marc-André Moreau
910f9ffed6 libfreerdp: wrap inclusion of config.h with HAVE_CONFIG_H 2012-08-14 17:41:40 -04:00
Marc-André Moreau
d5d1eb7762 libfreerdp: add proper config.h inclusions 2012-08-14 17:09:01 -04:00
Marc-André Moreau
cf7c65ba00 libwinpr: add support for monolithic build (single libwinpr.so) 2012-08-14 14:37:31 -04:00
Marc-André Moreau
c56f7064f2 libfreerdp: fix linking libraries for monolithic build 2012-08-14 00:31:06 -04:00
Marc-André Moreau
9f300ec70a libfreerdp: add support for monolithic build 2012-08-13 23:50:50 -04:00
Marc-André Moreau
19028a27b0 libfreerdp: move all libraries to libfreerdp directory, one step closer to monolithic build option 2012-08-13 23:19:51 -04:00