projects / navit-package / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dc6f4b4 432e0f8)
Merge commit 'origin/upstream-svn' into upstream
authorGilles Filippini <gilles.filippini@free.fr>
Thu, 24 Sep 2009 20:04:57 +0000 (22:04 +0200)
committerGilles Filippini <gilles.filippini@free.fr>
Thu, 24 Sep 2009 20:04:57 +0000 (22:04 +0200)
Conflicts:
navit/graphics/win32/graphics_win32.c
navit/graphics/win32/graphics_win32.h


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