git.samba.org / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f81d002 a89778c)
Merge commit 'origin/master' into martins
authorMartin Schwenke <martin@meltin.net>
Thu, 10 Jul 2008 05:08:26 +0000 (15:08 +1000)
committerMartin Schwenke <martin@meltin.net>
Thu, 10 Jul 2008 05:08:26 +0000 (15:08 +1000)
(This used to be ctdb commit 747650303b87e50ebc08ef7fa63011e4f19afc4f)

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

diff --cc ctdb/Makefile.in
index 62f18b47ebeb73b51de679fe3b7fc204abc723ff,a8fa1976a5fef53ab9974d9986ae167f0eaafe76..9b5ebe0288955dd5efa558a3650e2c7a0065e050
mode 100755,100644..100755
--- 1/ctdb/Makefile.in
--- 2/ctdb/Makefile.in
+++ b/ctdb/Makefile.in
Samba Shared Repository