diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-09-15 18:03:45 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-09-15 18:03:45 +0200 |
commit | 7979cae206cd1e1e352f32fba6165aa3b56f4add (patch) | |
tree | b6d25f20786fbd47a0a98d81784988e5d9f30c11 /.gitignore | |
parent | 47b26ef57c57cfe2b6c9acf90af785c0b2e73404 (diff) | |
parent | 9c455879f02606127686cde50552af53ccff8cb8 (diff) | |
download | samba-7979cae206cd1e1e352f32fba6165aa3b56f4add.tar.gz samba-7979cae206cd1e1e352f32fba6165aa3b56f4add.tar.bz2 samba-7979cae206cd1e1e352f32fba6165aa3b56f4add.zip |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into wmi
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index b72ebe63a7..0b94be52a0 100644 --- a/.gitignore +++ b/.gitignore @@ -107,6 +107,8 @@ source3/smbd/build_options.c source3/st source3/tags source3/TAGS +source3/samba4-data.mk +source3/samba4-config.mk source3/torture.tdb source4/apidocs source4/auth/auth_proto.h @@ -296,6 +298,10 @@ source4/winbind/idmap_proto.h source4/winbind/wb_helper.h source4/winbind/wb_proto.h source4/wrepl_server/wrepl_server_proto.h +source4/heimdal/lib/roken/roken.h +source4/lib/ldb-samba/ldif_handlers_proto.h +source4/libcli/drsblobs_proto.h +source4/ntvfs/posix/vfs_acl_proto.h *.swp tags *.x |