[sweethome3d-textures-editor] 07/16: Merge tag 'upstream/1.5'

[Markus Koschany]

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

apo pushed a commit to branch master
in repository sweethome3d-textures-editor.

commit 2ad1388517200380f66928ae56a9afd73bb0bbca
Merge: 8382150 9284801
Author: Markus Koschany <apo at debian.org>
Date:   Mon Oct 10 14:20:43 2016 +0200

    Merge tag 'upstream/1.5'
    
    Upstream version 1.5
    
    # gpg: Signatur vom Mo 10 Okt 2016 14:20:42 CEST
    # gpg:                mittels RSA-Schlüssel D9AD14B9513B51E4
    # gpg: Korrekte Signatur von "Markus Koschany <apo at gambaru.de>" [ultimativ]
    # gpg:                     alias "Markus Koschany <markus at koschany.net>" [ultimativ]
    # gpg:                     alias "Markus Koschany <apo at debian.org>" [ultimativ]

 LICENSE.TXT                                        |  2 +-
 README.TXT                                         | 12 ++++----
 build.xml                                          |  5 ++--
 .../io/TexturesLibraryFileRecorder.java            | 33 +++++++++++++---------
 .../textureslibraryeditor/swing/package.properties |  4 +--
 .../swing/package_fr.properties                    |  2 +-
 6 files changed, 33 insertions(+), 25 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sweethome3d-textures-editor.git