Merge remote branch 'origin/upstream-svn' into upstream
authorGilles Filippini <gilles.filippini@free.fr>
Thu, 10 Dec 2009 20:38:30 +0000 (21:38 +0100)
committerGilles Filippini <gilles.filippini@free.fr>
Thu, 10 Dec 2009 20:38:30 +0000 (21:38 +0100)
commit7349deb97accedb7e61d919924697a11c56677d0
tree78ebcedd35e5c2b2b824444af58bf43496ea750c
parent14b32229db5df1b9a878cab22c6d803460181b55
parent8dada5fe60eab552661184eacd6696d74d215a12
Merge remote branch 'origin/upstream-svn' into upstream

Conflicts:
navit/android.c
navit/android.h
navit/android/AndroidManifest.xml.in
navit/android/src/org/navitproject/navit/Navit.java
navit/android/src/org/navitproject/navit/NavitCamera.java
navit/android/src/org/navitproject/navit/NavitGraphics.java
navit/graphics/win32/graphics_win32.c
navit/gui/win32/win32_gui_destination.c
navit/support/espeak/Makefile.am