summaryrefslogtreecommitdiffstats
path: root/freerdp1/xrdp-freerdp.h
diff options
context:
space:
mode:
authorMarc-André Moreau <marcandre.moreau@gmail.com>2012-12-20 08:05:08 -0800
committerMarc-André Moreau <marcandre.moreau@gmail.com>2012-12-20 08:05:08 -0800
commitcc03ff6704f55ac570dc0b5abc7ed1407f086364 (patch)
tree3b0e80d57598cf5a2c45e38e12bf8bb93db5cb39 /freerdp1/xrdp-freerdp.h
parent6e7f9caea361eb50b844f8cc911adae0aff269a0 (diff)
parent963a3faed7f125f52c70978261450475891e5f9c (diff)
downloadxrdp-proprietary-cc03ff6704f55ac570dc0b5abc7ed1407f086364.tar.gz
xrdp-proprietary-cc03ff6704f55ac570dc0b5abc7ed1407f086364.zip
Merge pull request #42 from Osirium/freerdp-refactor-06-dec-2012
Freerdp refactor 06 dec 2012
Diffstat (limited to 'freerdp1/xrdp-freerdp.h')
-rw-r--r--freerdp1/xrdp-freerdp.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/freerdp1/xrdp-freerdp.h b/freerdp1/xrdp-freerdp.h
index 9ea0bcb0..1022e21d 100644
--- a/freerdp1/xrdp-freerdp.h
+++ b/freerdp1/xrdp-freerdp.h
@@ -30,7 +30,7 @@
#include <freerdp/rail.h>
#include <freerdp/rail/rail.h>
#include <freerdp/codec/bitmap.h>
-#include <freerdp/utils/memory.h>
+//#include <freerdp/utils/memory.h>
//#include "/home/jay/git/jsorg71/staging/include/freerdp/freerdp.h"
struct bitmap_item