git.samba.org / vlendec / samba-autobuild / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c9ca8cc e54347f)
Merge commit 'origin/master' into martins
authorMartin Schwenke <martin@meltin.net>
Sun, 7 Dec 2008 21:57:46 +0000 (08:57 +1100)
committerMartin Schwenke <martin@meltin.net>
Sun, 7 Dec 2008 21:57:46 +0000 (08:57 +1100)
(This used to be ctdb commit ec354d602d20700e6769deb798436d08256a49d5)

1  2 
ctdb/Makefile.in patch | diff1 | diff2 | blob | history

diff --cc ctdb/Makefile.in
Simple merge
Unnamed repository; edit this file 'description' to name the repository.