diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-25 12:58:09 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-25 12:58:09 +0100 |
| commit | 584c4a518f4d18452b6515db132e4f75fba733a1 (patch) | |
| tree | bbe367f36f092f233d7aefb61d75d5d1e1e85031 /.gitignore | |
| parent | 03ab8f9d79f2a06b357b2f5d392ea8b5be263c5e (diff) | |
| parent | 71943b209b181e1e4a65ab477b83780add7051ae (diff) | |
| download | samba-584c4a518f4d18452b6515db132e4f75fba733a1.tar.gz samba-584c4a518f4d18452b6515db132e4f75fba733a1.tar.bz2 samba-584c4a518f4d18452b6515db132e4f75fba733a1.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
Conflicts:
source/build/smb_build/header.pm
source/build/smb_build/makefile.pm
source/lib/ldb/include/ldb_private.h
(This used to be commit 1a646af0647f021d99473a8991c35e616a423ea6)
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index b0786b66d6..f75f698c65 100644 --- 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 |