mirrors/xrdp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	Makefile.am
This commit is contained in:
Itamar Reis Peixoto 2010-11-21 00:38:20 -02:00
commit b06f72f3b9
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -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 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 if XRDP_FREERDP
FREERDPDIR = freerdp FREERDPDIR = freerdp
else else
FREERDPDIR = FREERDPDIR =
endif endif
=======
>>>>>>> 52cf642bcaaad68f1e82ebdd66778404d8f97412
SUBDIRS = \ SUBDIRS = \
common \ common \