projects / navit-package / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c1aeef0 c92517f)
Merge branch 'upstream-svn' into upstream
authorBernd Zeimetz <bernd@bzed.de>
Tue, 2 Sep 2008 20:47:18 +0000 (22:47 +0200)
committerBernd Zeimetz <bernd@bzed.de>
Tue, 2 Sep 2008 20:47:18 +0000 (22:47 +0200)
Resolved conflicts:

po/cs.po
po/da.po
po/de.po
po/es.po
po/fi.po
po/fr.po
po/he.po
po/it.po
po/nb.po
po/nl.po
po/pl.po
po/ru.po
po/sk.po
po/sl.po
po/sv.po


Trivial merge
Unnamed repository; edit this file to name it for gitweb.