diff options
author | Michael Vogt <michael.vogt@ubuntu.com> | 2012-05-21 11:29:05 +0200 |
---|---|---|
committer | Michael Vogt <michael.vogt@ubuntu.com> | 2012-05-21 11:29:05 +0200 |
commit | 6c1f5d2c3c8df164e78dda8f24d28667634403e1 (patch) | |
tree | d711a52cf5a92a13b87f248307f5521846a7dbcf /ftparchive/makefile | |
parent | aa2218b25cb29e8c0677f0f3ede098583c7ae49f (diff) | |
parent | 0baf849d81814fce59d86eecccbe624c8aaf0456 (diff) |
merged from David, uncommited the previous i18n commit first as its part of the merge from David already but for some reason bzr is confused and gives a gazillion of conflicts in doc/po/de.po without the uncommit first
Diffstat (limited to 'ftparchive/makefile')
0 files changed, 0 insertions, 0 deletions