[creepy] 04/11: Merge tag 'upstream/1.3'

[Ross Gammon]

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

ross-guest pushed a commit to branch master
in repository creepy.

commit 3ee2b30f3ce28b6a4c78ae492a8558be69e75a09
Merge: 1bca0e3 d590490
Author: Ross Gammon <rossgammon at mail.dk>
Date:   Sun Feb 15 22:13:03 2015 +0100

    Merge tag 'upstream/1.3'
    
    Upstream version 1.3
    
    # gpg: Signature made Sun 15 Feb 2015 10:13:03 PM CET
    # gpg:                using RSA key 0x733E6BF93CE8F6D9
    # gpg: Good signature from "Ross Gammon (Rosco) <rossgammon at mail.dk>"
    # gpg:                 aka "Ross Gammon (www.one-name.org) <gammon at one-name.org>"
    # gpg:                 aka "Ross Gammon (www.the-gammons.net) <ross at the-gammons.net>"
    # gpg:                 aka "Ross Gammon (Genealogy) <genealogy at the-gammons.net>"
    # gpg:                 aka "[jpeg image of size 3524]"
    # Primary key fingerprint: FBEE 0190 904F 1EA0 BA6A  300E 53FE 7BBD A689 10FC
    #      Subkey fingerprint: 7AEE BC7A 44AB 8B90 5CA7  8FC6 733E 6BF9 3CE8 F6D9

 .gitignore                                         |     3 +-
 creepy/CreepyMain.py                               |   369 +-
 creepy/components/FilterLocationsCustomDialog.py   |    10 +
 creepy/components/PersonProjectWizard.py           |    91 +-
 creepy/components/PluginsConfigurationDialog.py    |    11 +-
 creepy/components/creepy_resources_compiled.py     | 25456 +++++++++++++++++++
 creepy/include/analysis.css                        |    75 +
 creepy/include/creepy.ico                          |   Bin 0 -> 221574 bytes
 creepy/include/creepy.png                          |   Bin 0 -> 365794 bytes
 creepy/include/creepy16.png                        |   Bin 0 -> 868 bytes
 creepy/include/creepy255.png                       |   Bin 0 -> 110821 bytes
 creepy/include/creepy32.png                        |   Bin 0 -> 2683 bytes
 creepy/include/creepy64.png                        |   Bin 0 -> 9111 bytes
 creepy/include/creepy_resources.qrc                |    44 +-
 creepy/include/map.html                            |   148 +-
 creepy/include/markerclusterer.js                  |  1290 +
 creepy/include/markerwithlabel.js                  |   581 +
 creepy/models/InputPlugin.py                       |    41 +-
 creepy/models/Location.py                          |     5 +-
 creepy/models/Project.py                           |     5 +-
 creepy/models/ProjectTree.py                       |     8 +-
 creepy/models/ProjectWizardPluginListModel.py      |     6 +-
 creepy/plugins/flickr/flickr.conf                  |     5 +-
 creepy/plugins/flickr/flickr.labels                |     1 +
 creepy/plugins/flickr/flickr.py                    |   209 +-
 creepy/plugins/flickr/marker.png                   |   Bin 0 -> 4216 bytes
 creepy/plugins/googleplus/googleplus.conf          |    13 +
 creepy/plugins/googleplus/googleplus.labels        |     6 +
 creepy/plugins/googleplus/googleplus.py            |   223 +
 creepy/plugins/googleplus/googleplus.yapsy-plugin  |     9 +
 creepy/plugins/googleplus/logo.png                 |   Bin 0 -> 3065 bytes
 creepy/plugins/googleplus/marker.png               |   Bin 0 -> 4396 bytes
 creepy/plugins/instagram/instagram.conf            |     4 +-
 creepy/plugins/instagram/instagram.py              |   168 +-
 creepy/plugins/instagram/marker.png                |   Bin 0 -> 4114 bytes
 creepy/plugins/twitter/marker.png                  |   Bin 0 -> 3898 bytes
 creepy/plugins/twitter/twitter.conf                |     6 +-
 creepy/plugins/twitter/twitter.py                  |   261 +-
 creepy/ui/AboutDialog.py                           |    45 +-
 creepy/ui/CompareProjectsDialog.py                 |    86 +
 creepy/ui/CreepyUI.py                              |   176 +-
 creepy/ui/FilterLocationsCustomDialog.py           |   102 +
 creepy/ui/FilterLocationsDateDialog.py             |    39 +-
 creepy/utilities/GeneralUtilities.py               |    65 +-
 creepy_windows_installer.iss                       |    54 +
 gui/aboutDialog.ui                                 |    36 +-
 ...tionsDateDialog.ui => compareProjectsDialog.ui} |    48 +-
 gui/creepy.ui                                      |    73 +-
 ...ateDialog.ui => filterLocationsCustomDialog.ui} |    80 +-
 gui/filterLocationsDateDialog.ui                   |     6 +-
 setup.py                                           |    42 +
 51 files changed, 29147 insertions(+), 753 deletions(-)

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