git.samba.org / bbaumbach / samba-autobuild / .git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9198a51 8ed6f6d)
Fix merge errors on C provision interface after jelmer's good work.
authorAndrew Bartlett <abartlet@samba.org>
Fri, 11 Apr 2008 01:11:42 +0000 (11:11 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 11 Apr 2008 01:11:42 +0000 (11:11 +1000)
commitae977ef24780c52da66e3608a3ed94649ae9f873
tree51f1a491b9f515049bc6eb3dc2b3b8ae2a3743e6tree
parent9198a519bea19a4d9f863fde5fb3aa23f60b5c88commit | diff
parent8ed6f6d5a825c8b0e8d66d30877a91a96fe6e7a4commit | diff
Fix merge errors on C provision interface after jelmer's good work.

Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet

Conflicts:

source/torture/local/torture.c
(This used to be commit 5bf1c89cf8af08fbcf4f5089079920840daad7b8)
source4/param/provision.c diff1 | diff2 | blob | history
source4/param/provision.h diff1 | diff2 | blob | history
source4/scripting/python/samba/provision.py diff1 | diff2 | blob | history
source4/torture/libnet/libnet_BecomeDC.c diff1 | diff2 | blob | history
source4/torture/local/torture.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.