Merge branch 'master' of ssh://git.samba.org/data/git/samba

[tprouty/samba.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 07058be52bf834f88be82db59a9745721f12e74f..4985738891f6d6ba9989239a5234f720dc0f8728 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -313,3 +313,4 @@ source3/librpc/gen_ndr/cli_drsblobs.c
 source3/librpc/gen_ndr/cli_drsblobs.h
 source3/librpc/gen_ndr/srv_drsblobs.c
 source3/librpc/gen_ndr/srv_drsblobs.h
+source3/setup