diff options
| author | Stefan Metzmacher <metze@samba.org> | 2005-11-21 14:21:56 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:46:36 -0500 |
| commit | f7e1df6de7c033d35f781cb49405a1d524993bf1 (patch) | |
| tree | af271054b4ac43c3699642c6e83f7edfb884d1a6 /source4/torture/config.mk | |
| parent | 363ce0b0168f19f9a57966c2ebee610e63f249c9 (diff) | |
| download | samba-f7e1df6de7c033d35f781cb49405a1d524993bf1.tar.gz samba-f7e1df6de7c033d35f781cb49405a1d524993bf1.tar.bz2 samba-f7e1df6de7c033d35f781cb49405a1d524993bf1.zip | |
r11832: - some updates for the conflict resolving logic
- use better function names
metze
(This used to be commit 35ab665957a0114e749e4045abdc2fb482867711)
Diffstat (limited to 'source4/torture/config.mk')
0 files changed, 0 insertions, 0 deletions