projects / navit-package / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b9466f3 efbfe5b)
Merge branch 'upstream-svn' into upstream
authorHenning Heinold <heinold@inf.fu-berlin.de>
Sun, 17 Jan 2010 02:10:39 +0000 (03:10 +0100)
committerHenning Heinold <heinold@inf.fu-berlin.de>
Sun, 17 Jan 2010 02:10:39 +0000 (03:10 +0100)
Conflicts:
navit/graphics/win32/Makefile.am
navit/support/libc/Makefile.am


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