summaryrefslogtreecommitdiff
path: root/source4/po
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2005-10-27 13:12:35 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:45:20 -0500
commitb323a81b7c46740a5abc91e382deaa7ab92bef3b (patch)
tree67ed0639f4dc5c2afa206376f9b77d422951a635 /source4/po
parent7ec41c942458d85fc439d3608115428d15257544 (diff)
downloadsamba-b323a81b7c46740a5abc91e382deaa7ab92bef3b.tar.gz
samba-b323a81b7c46740a5abc91e382deaa7ab92bef3b.tar.bz2
samba-b323a81b7c46740a5abc91e382deaa7ab92bef3b.zip
r11331: add conflict cases owned,released vs. replica
metze (This used to be commit d3049936a574e35eb00f072a3c378db0b69170aa)
Diffstat (limited to 'source4/po')
0 files changed, 0 insertions, 0 deletions