projects / navit-package / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 366f1b7 7b8409a)
Merge commit 'origin/upstream-svn' into upstream
authorGilles Filippini <gilles.filippini@free.fr>
Mon, 18 May 2009 20:22:00 +0000 (22:22 +0200)
committerGilles Filippini <gilles.filippini@free.fr>
Mon, 18 May 2009 20:22:00 +0000 (22:22 +0200)
Conflicts:
navit/graphics/win32/graphics_win32.c
navit/graphics/win32/graphics_win32.h
navit/gui/win32/Makefile.am
navit/gui/win32/gui_win32.c
navit/gui/win32/win32_gui_destination.c


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