diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-04-08 03:45:06 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-04-08 03:45:06 +0200 |
commit | b5d84a74d146cfe0d2e0c336a88bd269ad61cded (patch) | |
tree | 8acad6b634cfe312144f92f8a0fb6ab44b47cd19 /.gitignore | |
parent | 237f1cca028881a57f961884f427673907c1535a (diff) | |
parent | 1f474f4a545752f7ac0ad402d01d1e768b973dbe (diff) | |
download | samba-b5d84a74d146cfe0d2e0c336a88bd269ad61cded.tar.gz samba-b5d84a74d146cfe0d2e0c336a88bd269ad61cded.tar.bz2 samba-b5d84a74d146cfe0d2e0c336a88bd269ad61cded.zip |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
Conflicts:
source/auth/credentials/config.mk
source/auth/gensec/config.mk
source/build/smb_build/makefile.pm
source/heimdal_build/config.mk
source/lib/events/config.mk
source/lib/nss_wrapper/config.mk
source/lib/policy/config.mk
source/lib/registry/config.mk
source/lib/socket_wrapper/config.mk
source/lib/tdb/config.mk
source/lib/tls/config.mk
source/lib/util/config.mk
source/libcli/config.mk
source/libcli/ldap/config.mk
source/libnet/config.mk
source/librpc/config.mk
source/param/config.mk
source/rpc_server/config.mk
source/scripting/ejs/config.mk
source/smbd/process_model.mk
(This used to be commit 760378e0294dd0cd4523a83448328478632d7e3d)
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index 3a2e5642e7..1ad2e2501f 100644 --- a/.gitignore +++ b/.gitignore @@ -66,7 +66,6 @@ source/lib/tdr/tdr_proto.h source/lib/util/pidfile.h source/lib/util/unix_privs.h source/lib/util/util_proto.h -source/lib/util/wrap_xattr.h source/lib/util/asn1_proto.h source/libcli/finddcs.h source/libcli/libcli_proto.h @@ -190,8 +189,6 @@ source/dsdb/schema/proto.h source/lib/crypto/test_proto.h source/lib/registry/tests/proto.h source/lib/util/apidocs -source/lib/util/util_ldb.h -source/libcli/ldap/ldap_ndr.h source/libcli/resolve/lp_proto.h source/apidocs *.swp |