diff options
| author | Itamar Reis Peixoto <itamar@ispbrasil.com.br> | 2010-11-21 05:42:51 +0300 |
|---|---|---|
| committer | Itamar Reis Peixoto <itamar@ispbrasil.com.br> | 2010-11-21 05:42:51 +0300 |
| commit | 23b42a48831b326a669c0e39c929375ee34635d9 (patch) | |
| tree | fbd28fe3b9410fe714132f2bd588f49661536835 /Makefile.am | |
| parent | b06f72f3b910ff23a33fa6636edd04276784334a (diff) | |
fix mistake in Makefile.am
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index a65355e4..c50f207e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,13 +1,10 @@ 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 \ |