r319: Merge from trunk

[nbd.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 5a2ed74..6a022fa 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ autom4te.cache
 autoscan.log
 config.h
 config.h.in
+*~
 config.log
 config.status
 configure
@@ -25,3 +26,11 @@ mkinstalldirs
 nbd-tester-client
 nbd-client
 nbd-server
+config.guess
+config.sub
+doc
+nbd-server.config
+nbd-server.1.in
+nbd-server.5.in
+nbd-server.5
+nbd.h