git.samba.org / metze / samba / wip.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f008c3b e8ba65c)
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Thu, 4 Sep 2008 02:49:29 +0000 (12:49 +1000)
committerAndrew Tridgell <tridge@samba.org>
Thu, 4 Sep 2008 02:49:29 +0000 (12:49 +1000)
1  2 
source/scripting/python/misc.i patch | diff1 | diff2 | blob | history
source/scripting/python/misc_wrap.c patch | diff1 | diff2 | blob | history

diff --cc source/scripting/python/misc.i
Simple merge
diff --cc source/scripting/python/misc_wrap.c
Simple merge
Work in progress branches