projects / navit-package / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7349deb e0023b3)
Merge remote branch 'origin/upstream-svn' into upstream
authorGilles Filippini <pini@debian.org>
Thu, 7 Jan 2010 21:36:07 +0000 (22:36 +0100)
committerGilles Filippini <pini@debian.org>
Thu, 7 Jan 2010 21:36:07 +0000 (22:36 +0100)
Conflicts:
navit/android/src/org/navitproject/navit/NavitGraphics.java


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