Merge prog_std.txt into coding_style.md

2016-10-16 22:06:20 -07:00
parent c9108242cd
commit acdfc94511
4 changed files with 18 additions and 44 deletions
@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4
 AM_DISTCHECK_CONFIGURE_FLAGS = --without-systemdsystemunitdir

 EXTRA_DIST = bootstrap COPYING coding_style.md design.txt faq-compile.txt \
-  faq-general.txt file-loc.txt install.txt m4 prog_std.txt readme.txt
+  faq-general.txt file-loc.txt install.txt m4 readme.txt

 if XRDP_NEUTRINORDP
 NEUTRINORDPDIR = neutrinordp