summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-07-21 13:56:58 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-07-21 13:56:58 -0400
commit20cae78ac793be8d1ccc919e2c57a52c7551d9ba (patch)
tree844e47d8ee325e8fa5aef5fa93f08ebf10f473d4 /po
parent494e7ab8baedb5e4f8c7d1ff0d88ecd8b7d4a775 (diff)
update on some of the conflict cases
Diffstat (limited to 'po')
0 files changed, 0 insertions, 0 deletions