diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-19 14:33:05 +0100 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-19 14:33:05 +0100 |
commit | 12ea7dd32513b2f299e24ae1645b821f8e6597e6 (patch) | |
tree | b8ac430836f7a99a7157f6c3f175b74e82907194 /.gitignore | |
parent | 33f63de66bb16c4ca96255a17975268a7d958281 (diff) | |
parent | b617f58cc39ffb5e7f775b88887bcf9112b1ded1 (diff) | |
download | samba-12ea7dd32513b2f299e24ae1645b821f8e6597e6.tar.gz samba-12ea7dd32513b2f299e24ae1645b821f8e6597e6.tar.bz2 samba-12ea7dd32513b2f299e24ae1645b821f8e6597e6.zip |
Merge branch 'v4-0-trivial' into v4-0-kvmtest
(This used to be commit 732d2bba83c68d337a4a0290245ba8b3eb0635dd)
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index b0786b66d6..6076ddc9cd 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 |