summaryrefslogtreecommitdiff
path: root/po/ChangeLog
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2005-12-09 09:10:38 +0000
committerMichael Vogt <michael.vogt@ubuntu.com>2005-12-09 09:10:38 +0000
commita3e5f77bc1cbd7fcf911782bb264e67b753aef71 (patch)
tree71f15d76d81b3bae2fe36d0419d046da62c73c99 /po/ChangeLog
parenta947ddf372849cb7ba989c16661974c2333e3257 (diff)
* fixed conflict in changelog
Diffstat (limited to 'po/ChangeLog')
0 files changed, 0 insertions, 0 deletions