projects / navit-package / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 28d91c3 d28fa78)
Merge commit 'origin/upstream-svn' into upstream
authorGilles Filippini <gilles.filippini@free.fr>
Sat, 3 Oct 2009 17:56:31 +0000 (19:56 +0200)
committerGilles Filippini <gilles.filippini@free.fr>
Sat, 3 Oct 2009 17:56:31 +0000 (19:56 +0200)
Conflicts:
navit/support/Makefile.am
navit/support/glib/gprintfint.h


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