[SCM] Samba Shared Repository - branch master updated - 6c83039eaba70fe983325f15359f1bafc40c4ec6

[Jelmer Vernooij]

The branch, master has been updated
       via  6c83039eaba70fe983325f15359f1bafc40c4ec6 (commit)
       via  18faf30d1684ed9d46ffa42b6d6f9768c2b0c54f (commit)
      from  339925f98d5b42f7ea09842f3920fb9281e6caa2 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 6c83039eaba70fe983325f15359f1bafc40c4ec6
Merge: 18faf30d1684ed9d46ffa42b6d6f9768c2b0c54f 339925f98d5b42f7ea09842f3920fb9281e6caa2
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Oct 18 15:37:57 2008 +0200

    Merge branch 'master' of ssh://git.samba.org/data/git/samba into xmaster

commit 18faf30d1684ed9d46ffa42b6d6f9768c2b0c54f
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Oct 18 15:06:45 2008 +0200

    Fix gitignore.

-----------------------------------------------------------------------

Summary of changes:
 .gitignore |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/.gitignore b/.gitignore
index b61bf4e..9815f70 100644
--- a/.gitignore
+++ b/.gitignore
@@ -196,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
@@ -230,7 +230,7 @@ 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
+lib/util/apidocs
 lib/util/asn1_proto.h
 lib/util/pidfile.h
 lib/util/unix_privs.h


-- 
Samba Shared Repository