git.samba.org / ira / wip.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 30eff4f 85b8ccc)
Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorAndrew Tridgell <tridge@samba.org>
Wed, 3 Dec 2008 06:47:39 +0000 (17:47 +1100)
committerAndrew Tridgell <tridge@samba.org>
Wed, 3 Dec 2008 06:47:39 +0000 (17:47 +1100)
1  2 
source4/lib/ldb/ldb.i patch | diff1 | diff2 | blob | history
source4/lib/ldb/ldb_wrap.c patch | diff1 | diff2 | blob | history

diff --cc source4/lib/ldb/ldb.i
Simple merge
diff --cc source4/lib/ldb/ldb_wrap.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.