]> git.donarmstrong.com Git - roundcube.git/commitdiff
Merge commit 'debian/0.1-4' into debian
authorJérémy Bobbio <lunar@debian.org>
Sat, 18 Jun 2011 17:18:48 +0000 (19:18 +0200)
committerJérémy Bobbio <lunar@debian.org>
Sat, 18 Jun 2011 17:18:48 +0000 (19:18 +0200)
Conflicts:
debian/po/ar.po
debian/po/cs.po
debian/po/eu.po
debian/po/fi.po
debian/po/gl.po
debian/po/pt.po
debian/po/ru.po
debian/po/ta.po

1  2 
debian/po/ar.po
debian/po/eu.po
debian/po/fi.po
debian/po/ru.po
debian/po/ta.po

diff --cc debian/po/ar.po
Simple merge
diff --cc debian/po/eu.po
Simple merge
diff --cc debian/po/fi.po
Simple merge
diff --cc debian/po/ru.po
Simple merge
diff --cc debian/po/ta.po
Simple merge