diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-05-21 18:04:47 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-05-21 18:04:47 +0200 |
| commit | 20796bcf57a7f5e1921dc12e0568221f985fe4f2 (patch) | |
| tree | 8f0540a602a9ea0031d656bc31c0b8bc1e91eb70 /.gitignore | |
| parent | 323be4a6907e4915bb76aa103bf5b868f0b459b1 (diff) | |
| parent | 1a416ff13ca7786f2e8d24c66addf00883e9cb12 (diff) | |
| download | samba-20796bcf57a7f5e1921dc12e0568221f985fe4f2.tar.gz samba-20796bcf57a7f5e1921dc12e0568221f985fe4f2.tar.bz2 samba-20796bcf57a7f5e1921dc12e0568221f985fe4f2.zip | |
Merge branch 'v3-3-test' of ssh://git.samba.org/data/git/samba into docbook
Conflicts:
source/Makefile.in
(This used to be commit 01987778a123f853fccdcb7fe9566143e2d7c490)
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore index 7fe98e03d6..1d1513999b 100644 --- a/.gitignore +++ b/.gitignore @@ -5,12 +5,9 @@ *.patch semantic.cache source/TAGS -source/client/client_proto.h -source/libnet/libnet_proto.h source/include/build_env.h source/include/config.h source/include/config.h.in -source/include/proto.h source/include/stamp-h source/include/version.h source/Makefile @@ -25,17 +22,12 @@ source/script/gen-8bit-gap.sh source/script/installbin.sh source/script/uninstallbin.sh source/smbd/build_options.c -source/utils/net_proto.h -source/utils/ntlm_auth_proto.h -source/web/swat_proto.h source/tags -source/utils/passwd_proto.h source/include/includes.h.gch source/config.cache source/library-versions source/nsswitch/*.so source/proto_exists -source/winbindd/winbindd_proto.h source/cscope.out source/torture.tdb source/pkgconfig/*.pc |