Merge branch 'master' of https://github.com/dgoetz/interfacetable_v3t …

…into dgoetz-master Conflicts: sbin/Makefile.in share/Makefile.in
dgoetz · Jun 14, 2014 · 22af3a4 · 22af3a4
2 parents 543127f + a418646
commit 22af3a4
Show file tree

Hide file tree

Showing 7 changed files with 1,093 additions and 942 deletions.
diff --git a/Makefile.in b/Makefile.in
@@ -27,6 +27,7 @@ GREP=@GREP@
 httpd_conf=@httpd_conf@
 apache_user=@apache_user@
 apache_authname=@apache_authname@
+apache_authfile=@apache_authfile@
 #Sudo specific
 sudoers=@sudoers@
 #Software configuration