]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
projects / thirdparty / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 933cb2e bba02ce)
merged tridge's branch
authorPeter Somogyi <psomogyi@gamax.hu>
Fri, 20 Apr 2007 12:50:10 +0000 (14:50 +0200)
committerPeter Somogyi <psomogyi@gamax.hu>
Fri, 20 Apr 2007 12:50:10 +0000 (14:50 +0200)
(This used to be ctdb commit b40d044fc5b057b707a6f5637313c0836981a66e)

1  2 
ctdb/common/ctdb_daemon.c patch | diff1 | diff2 | blob | history

diff --cc ctdb/common/ctdb_daemon.c
Simple merge
Mirror of https://github.com/samba-team/samba.git