Marc-André Moreau 7e1dbd505b Merge branch 'awakecoding' of https://github.com/vworkspace/FreeRDP ... Conflicts: channels/rdpdr/server/rdpdr_main.c		2015-05-20 11:40:48 -04:00
..
cache	free can handle NULL perfectly fine	2015-05-11 09:07:39 +02:00
codec	Fix rounding error in progressive codec	2015-05-20 12:26:58 +01:00
common	Merge branch 'master' of github.com:FreeRDP/FreeRDP	2015-05-20 10:12:24 -04:00
core	Merge branch 'awakecoding' of https://github.com/vworkspace/FreeRDP	2015-05-20 11:40:48 -04:00
crypto	free can handle NULL perfectly fine	2015-05-11 09:07:39 +02:00
gdi	Merge branch 'master' of github.com:FreeRDP/FreeRDP	2015-05-20 10:12:24 -04:00
locale	Necessary changes to get latest branch working on OpenBSD 5.6	2015-04-21 14:42:06 -04:00
primitives	Merge pull request #2435 from llyzs/llyzs	2015-03-06 11:33:30 +01:00
utils	ringbuffer: add option to enable/disable debugging	2015-02-03 15:28:05 +01:00
CMakeLists.txt	Remove the ARM_FP_ABI option	2015-05-01 17:35:21 -04:00