diff options
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 \ |