Merge branch 'master' into master

networkupstools · Oct 25, 2020 · f8374c0 · f8374c0
2 parents adefa3a + 52df79c
commit f8374c0
Show file tree

Hide file tree

Showing 222 changed files with 14,472 additions and 4,129 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,7 @@
 .deps/
 .libs/
 .inst/
+/_install_pkgprotodir/
 Makefile
 Makefile.in
 ## Parent directory only
@@ -19,6 +20,7 @@ Makefile.in
 /config.log
 /config.status
 /config.sub
+/config.cache
 /configure
 /cscope.*
 /depcomp
@@ -33,6 +35,10 @@ common/.dirstamp
 # Dist
 /nut-*.*.*/
 /nut-*.tar.gz
+/nut*.rpm
+/NUT*.local.gz
+/NUT*.p5i
+/NUT*.depot
 
 # Official dist
 /nut-*.tar.gz.md5