diff options
| author | Itamar Reis Peixoto <itamar@ispbrasil.com.br> | 2010-11-21 00:38:20 -0200 |
|---|---|---|
| committer | Itamar Reis Peixoto <itamar@ispbrasil.com.br> | 2010-11-21 00:38:20 -0200 |
| commit | b06f72f3b910ff23a33fa6636edd04276784334a (patch) | |
| tree | fe2ccce93fa52057a53aaa93dacdaf0a3d533adf /Makefile.am | |
| parent | 5a1a2531851c4cd344e08b408fc5e842a71b1ccb (diff) | |
| parent | 52cf642bcaaad68f1e82ebdd66778404d8f97412 (diff) | |
| download | xrdp-proprietary-b06f72f3b910ff23a33fa6636edd04276784334a.tar.gz xrdp-proprietary-b06f72f3b910ff23a33fa6636edd04276784334a.zip | |
Merge branch 'itamarjp' of ssh://xrdp.git.sourceforge.net/gitroot/xrdp/xrdp into itamarjp
Conflicts:
Makefile.am
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index c50f207e..a65355e4 100644 --- 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 \ |