git.samba.org / kai / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ee45d0d 4aa0bfc)
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
authorDerrell Lipman <derrell.lipman@unwireduniverse.com>
Mon, 3 Mar 2008 23:27:41 +0000 (18:27 -0500)
committerDerrell Lipman <derrell.lipman@unwireduniverse.com>
Mon, 3 Mar 2008 23:27:41 +0000 (18:27 -0500)
(This used to be commit 8927b50d6051fcefd87f19dc90c5826378d03e4e)

1  2 
WHATSNEW.txt patch | diff1 | diff2 | blob | history

diff --cc WHATSNEW.txt
Simple merge
Kai's WIP code