projects / navit-package / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b49a31d ed71aef)
Merge commit 'origin/upstream-svn' into upstream
authorGilles Filippini <gilles.filippini@free.fr>
Mon, 14 Sep 2009 22:17:30 +0000 (00:17 +0200)
committerGilles Filippini <gilles.filippini@free.fr>
Mon, 14 Sep 2009 22:17:30 +0000 (00:17 +0200)
Conflicts:
navit/graphics/win32/graphics_win32.c


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