[gosmore] 11/20: Merge tag 'upstream/0.0.0.svn30327'

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository gosmore.

commit fa507679fe5cc640569642e7c95c200a0ce4bd68
Merge: aeda01e 8ebc9e7
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat May 7 11:54:43 2016 +0200

    Merge tag 'upstream/0.0.0.svn30327'
    
    Upstream version 0.0.0.svn30327
    
    # gpg: Signature made Sat 07 May 2016 11:54:39 AM CEST
    # gpg:                using RSA key 0x6750F10AE88D4AF1
    # gpg: Good signature from "Bas Couwenberg <sebastic at debian.org>"
    # gpg:                 aka "Sebastiaan Couwenberg <sebastic at debian.org>"
    # gpg:                 aka "Sebastiaan Couwenberg <sebastic at xs4all.nl>"
    # gpg:                 aka "Bas Couwenberg <sebastic at xs4all.nl>"
    # Primary key fingerprint: 8182 DE41 7056 408D 6146  50D1 6750 F10A E88D 4AF1

 AndroidManifest.xml                                |   60 +
 Makefile.in                                        |   61 +-
 README                                             |   31 +-
 bboxSplit.cpp                                      |   11 +-
 bounds.osm.bz2                                     |  Bin 127660 -> 114507 bytes
 dailyUpdate.sh                                     |   66 +
 default.properties                                 |   12 +
 density.c                                          |    2 +-
 elemstyles.xml                                     |   34 +-
 gosmore.nsi                                        |    5 +
 jni/Android.mk                                     |   15 +
 jni/Application.mk                                 |    4 +
 ConvertUTF.c => jni/ConvertUTF.c                   |    0
 ConvertUTF.h => jni/ConvertUTF.h                   |    0
 ceglue.c => jni/ceglue.c                           |    0
 ceglue.h => jni/ceglue.h                           |    0
 gosmore.cpp => jni/gosmore.cpp                     | 1559 ++++++++++++--------
 libgosm.cpp => jni/libgosm.cpp                     |  274 ++--
 libgosm.h => jni/libgosm.h                         |   13 +-
 jni/openglespolygon.cpp                            |  532 +++++++
 jni/openglespolygon.h                              |   42 +
 resource.h => jni/resource.h                       |    0
 translations.c => jni/translations.c               |    0
 proguard.cfg                                       |   48 +
 res/drawable-hdpi/btn_square_overlay_normal.png    |  Bin 0 -> 929 bytes
 res/drawable-hdpi/btn_zoom_down_disabled.png       |  Bin 0 -> 2376 bytes
 .../btn_zoom_down_disabled_focused.png             |  Bin 0 -> 2697 bytes
 res/drawable-hdpi/btn_zoom_down_normal.png         |  Bin 0 -> 2104 bytes
 res/drawable-hdpi/btn_zoom_down_pressed.png        |  Bin 0 -> 4306 bytes
 res/drawable-hdpi/btn_zoom_down_selected.png       |  Bin 0 -> 4348 bytes
 res/drawable-hdpi/btn_zoom_up_disabled.png         |  Bin 0 -> 2531 bytes
 res/drawable-hdpi/btn_zoom_up_disabled_focused.png |  Bin 0 -> 2829 bytes
 res/drawable-hdpi/btn_zoom_up_normal.png           |  Bin 0 -> 2065 bytes
 res/drawable-hdpi/btn_zoom_up_pressed.png          |  Bin 0 -> 3806 bytes
 res/drawable-hdpi/btn_zoom_up_selected.png         |  Bin 0 -> 3802 bytes
 res/drawable-hdpi/ic_menu_play_clip.png            |  Bin 0 -> 2291 bytes
 res/drawable-hdpi/icon.png                         |  Bin 0 -> 3481 bytes
 res/drawable-hdpi/stat_sys_upload_anim0.png        |  Bin 0 -> 927 bytes
 res/drawable-ldpi/icon.png                         |  Bin 0 -> 1518 bytes
 res/drawable-mdpi/btn_square_overlay_normal.png    |  Bin 0 -> 1279 bytes
 res/drawable-mdpi/btn_zoom_down_disabled.png       |  Bin 0 -> 1534 bytes
 .../btn_zoom_down_disabled_focused.png             |  Bin 0 -> 1867 bytes
 res/drawable-mdpi/btn_zoom_down_normal.png         |  Bin 0 -> 1305 bytes
 res/drawable-mdpi/btn_zoom_down_pressed.png        |  Bin 0 -> 2370 bytes
 res/drawable-mdpi/btn_zoom_down_selected.png       |  Bin 0 -> 2395 bytes
 res/drawable-mdpi/btn_zoom_up_disabled.png         |  Bin 0 -> 1600 bytes
 res/drawable-mdpi/btn_zoom_up_disabled_focused.png |  Bin 0 -> 1911 bytes
 res/drawable-mdpi/btn_zoom_up_normal.png           |  Bin 0 -> 1305 bytes
 res/drawable-mdpi/btn_zoom_up_pressed.png          |  Bin 0 -> 2465 bytes
 res/drawable-mdpi/btn_zoom_up_selected.png         |  Bin 0 -> 2463 bytes
 res/drawable-mdpi/ic_menu_play_clip.png            |  Bin 0 -> 1194 bytes
 res/drawable-mdpi/icon.png                         |  Bin 0 -> 2383 bytes
 res/drawable-mdpi/stat_sys_download_anim0.png      |  Bin 0 -> 588 bytes
 res/drawable/mappaint.png                          |  Bin 0 -> 792812 bytes
 res/layout/download_progress.xml                   |   24 +
 res/layout/map_help.xml                            |  107 ++
 res/layout/map_view.xml                            |   67 +
 res/layout/old_main.xml                            |   29 +
 res/layout/search.xml                              |   29 +
 res/layout/search_result.xml                       |   30 +
 res/layout/update.xml                              |   31 +
 res/menu/map.xml                                   |   19 +
 res/values/arrays.xml                              |   38 +
 res/values/strings.xml                             |   58 +
 src/org/osmu/gosmore/Gosmore.java                  |   83 ++
 src/org/osmu/gosmore/MapActivity.java              |  726 +++++++++
 src/org/osmu/gosmore/Place.java                    |   10 +
 src/org/osmu/gosmore/Preferences.java              |   54 +
 src/org/osmu/gosmore/Recent.java                   |   31 +
 src/org/osmu/gosmore/Search.java                   |  131 ++
 src/org/osmu/gosmore/Update.java                   |  243 +++
 71 files changed, 3692 insertions(+), 787 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gosmore.git