Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local

[samba.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index b0786b66d65845679d4ad923e7641b28f583180d..3a2e5642e7db93c9cdceb5f81091f5e3cddaaa49 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -115,7 +115,6 @@ source/smb_server/smb2/smb2_proto.h
 source/smbd/process_model_proto.h
 source/smbd/service_proto.h
 source/torture/proto.h
-source/torture/util.h
 source/torture/auth/proto.h
 source/torture/basic/proto.h
 source/torture/ldap/proto.h
@@ -130,6 +129,7 @@ source/utils/net/net_proto.h
 source/web_server/proto.h
 source/winbind/wb_helper.h
 source/winbind/wb_proto.h
+source/winbind/idmap_proto.h
 source/wrepl_server/wrepl_server_proto.h
 tags
 source/auth/credentials/credentials_krb5_proto.h
@@ -197,3 +197,4 @@ source/apidocs
 *.swp
 source/mkconfig.mk
 source/data.mk
+source/librpc/idl-deps