Merge branch 'itamarjp' of ssh://xrdp.git.sourceforge.net/gitroot/xrdp/xrdp into itamarjp
Conflicts: Makefile.am
This commit is contained in:
commit
b06f72f3b9
@ -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 \
|
||||
|
Loading…
Reference in New Issue
Block a user