Merge branch 'itamarjp' of ssh://xrdp.git.sourceforge.net/gitroot/xrdp/xrdp into itamarjp

Conflicts: Makefile.am
14 years ago · b06f72f3b9
parent 5a1a253185 52cf642bca
commit b06f72f3b9
1 changed files with 3 additions and 0 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -1,10 +1,13 @@
 EXTRA_DIST = bootstrap COPYING design.txt faq-compile.txt faq-general.txt file-loc.txt install.txt prog_std.txt readme.txt
+<<<<<<< HEAD

 if XRDP_FREERDP
 FREERDPDIR = freerdp
 else
 FREERDPDIR =
 endif
+=======
+>>>>>>> 52cf642bcaaad68f1e82ebdd66778404d8f97412

 SUBDIRS = \
  common \