projects / navit-package / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 345ae2a 90897c4)
Merge commit 'origin/upstream-svn' into upstream
authorGilles Filippini <gilles.filippini@free.fr>
Mon, 16 Nov 2009 13:17:35 +0000 (14:17 +0100)
committerGilles Filippini <gilles.filippini@free.fr>
Mon, 16 Nov 2009 13:17:35 +0000 (14:17 +0100)
Conflicts:
navit/android.c
navit/android/src/org/navitproject/navit/NavitGraphics.java
navit/graphics/win32/graphics_win32.c
navit/support/Makefile.am
navit/support/espeak/Makefile.am


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