diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-21 14:51:13 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-21 14:51:13 +0200 |
| commit | 5209a846a9157e649fcdcb561f7eaf19c8c0e465 (patch) | |
| tree | b0a7e52b5646c8eec182dbc391e7934b6804488c /.gitignore | |
| parent | 625359b2e266105022309df8985720108ecd6f67 (diff) | |
| parent | 2ee8d29d22bcb1c350ab59d71b0aee548489bc9c (diff) | |
| download | samba-5209a846a9157e649fcdcb561f7eaf19c8c0e465.tar.gz samba-5209a846a9157e649fcdcb561f7eaf19c8c0e465.tar.bz2 samba-5209a846a9157e649fcdcb561f7eaf19c8c0e465.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into regsrv
Conflicts:
source4/lib/registry/ldb.c
source4/rpc_server/winreg/rpc_winreg.c
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 36 |
1 files changed, 24 insertions, 12 deletions
diff --git a/.gitignore b/.gitignore index b72ebe63a7..e617400cc5 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 @@ -179,7 +181,7 @@ source4/libcli/composite/proto.h source4/libcli/finddcs.h source4/libcli/ldap/ldap_proto.h source4/libcli/libcli_proto.h -source4/libcli/nbt/nbtname.h +libcli/nbt/nbtname.h source4/libcli/nbt/nbt_proto.h source4/libcli/ndr_netlogon_proto.h source4/libcli/netlogon_proto.h @@ -194,7 +196,7 @@ source4/libcli/util/proto.h source4/libcli/wrepl/winsrepl_proto.h source4/lib/cmdline/credentials.h source4/lib/cmdline/popt_credentials.h -source4/lib/crypto/test_proto.h +lib/crypto/test_proto.h source4/lib/db_wrap_proto.h source4/lib/ldb/bin source4/lib/ldb/examples/ldbreader @@ -228,12 +230,11 @@ source4/lib/tdb/bin/tdbdump source4/lib/tdb/bin/tdbtool source4/lib/tdb/bin/tdbtorture source4/lib/tdr/tdr_proto.h -source4/lib/util/apidocs -source4/lib/util/asn1_proto.h -source4/lib/util/pidfile.h -source4/lib/util/unix_privs.h -source4/lib/util/util_proto.h -source4/lib/util/util_tdb.h +lib/util/apidocs +lib/util/asn1_proto.h +lib/util/pidfile.h +lib/util/unix_privs.h +lib/util/util_proto.h source4/mkconfig.mk source4/nbt_server/dgram/proto.h source4/nbt_server/nbt_server_proto.h @@ -250,10 +251,10 @@ source4/param/proto.h source4/param/secrets_proto.h source4/param/share_proto.h source4/passdb/proto.h -source4/pidl/blib -source4/pidl/cover_db -source4/pidl/Makefile -source4/pidl/pm_to_blib +pidl/blib +pidl/cover_db +pidl/Makefile +pidl/pm_to_blib source4/rpc_server/common/proto.h source4/rpc_server/dcerpc_server_proto.h source4/rpc_server/lsa/proto.h @@ -296,6 +297,17 @@ 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 +packaging/RHEL-CTDB/samba.spec +packaging/RHEL/samba.spec +packaging/RHEL/makerpms.sh +source3/librpc/gen_ndr/cli_drsblobs.c +source3/librpc/gen_ndr/cli_drsblobs.h +source3/librpc/gen_ndr/srv_drsblobs.c +source3/librpc/gen_ndr/srv_drsblobs.h |