Commit Graph

7 Commits

Author SHA1 Message Date
Marc-André Moreau
8c08108b71 Merge pull request #699 from bmiklautz/issue_698
Fix for issue 698
2012-09-06 10:23:50 -07:00
Bernhard Miklautz
b2509f002b utils/pcap: Don't allocate memory for data in pcap_get_next_record_header 2012-09-06 12:58:36 +02:00
Bernhard Miklautz
afd0d2463f Merge branch 'master' into issue_698
Conflicts:
	libfreerdp/utils/args.c
2012-08-23 20:15:14 +02:00
Marc-André Moreau
e9936ddc96 cmake: merging with master 2012-08-14 20:21:00 -04:00
Marc-André Moreau
d5d1eb7762 libfreerdp: add proper config.h inclusions 2012-08-14 17:09:01 -04:00
Marc-André Moreau
c56f7064f2 libfreerdp: fix linking libraries for monolithic build 2012-08-14 00:31:06 -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