Merge branch 'master' into mysql_detect_mysqldump

1 files changed, 8 insertions, 3 deletions

diff --git a/.gitignore b/.gitignore
index c7b668e2..02ca61e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,10 +53,8 @@ NP-VERSION-FILE
 # /gl/
 /gl/.deps
 /gl/alloca.h
-/gl/arg-nonnull.h
 /gl/arpa
 /gl/arpa_inet.h
-/gl/c++defs.h
 /gl/charset.alias
 /gl/configmake.h
 /gl/errno.h
@@ -70,6 +68,8 @@ NP-VERSION-FILE
 /gl/locale.h
 /gl/Makefile
 /gl/Makefile.in
+/gl/malloc/.dirstamp
+/gl/malloc/.deps
 /gl/math.h
 /gl/netdb.h
 /gl/netinet_in.h
@@ -88,9 +88,13 @@ NP-VERSION-FILE
 /gl/sys
 /gl/time.h
 /gl/unistd.h
-/gl/warn-on-use.h
 /gl/wchar.h
 /gl/wctype.h
+/gl/inttypes.h
+/gl/limits.h
+/gl/malloc/dynarray-skeleton.gl.h
+/gl/malloc/dynarray.gl.h
+/gl/stdckdint.
 
 # /lib/
 /lib/.deps
@@ -242,6 +246,7 @@ NP-VERSION-FILE
 /plugins-scripts/check_ircd
 /plugins-scripts/check_log
 /plugins-scripts/check_mailq
+/plugins-scripts/check_mssql
 /plugins-scripts/check_ntp
 /plugins-scripts/check_oracle
 /plugins-scripts/check_rpc