projects / navit-package / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 131b8f9 75a3f40)
Merge branch 'upstream-svn' into upstream
authorHenning Heinold <heinold@inf.fu-berlin.de>
Thu, 28 Jan 2010 10:14:11 +0000 (11:14 +0100)
committerHenning Heinold <heinold@inf.fu-berlin.de>
Thu, 28 Jan 2010 10:14:11 +0000 (11:14 +0100)
Conflicts:
navit/support/libc/errno.h


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