[sweethome3d-furniture-editor] 01/04: Merge tag 'upstream/1.20'

[Markus Koschany]

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

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

commit b383d171d27159cb7f42acdb114ad0f44af41cd6
Merge: c771498 2a94b83
Author: Markus Koschany <apo at debian.org>
Date:   Mon Nov 28 23:01:37 2016 +0100

    Merge tag 'upstream/1.20'
    
    Upstream version 1.20
    
    # gpg: Signature made Mon 28 Nov 2016 23:01:36 CET
    # gpg:                using RSA key ACF3D088EF32EDEF6A1A835FD9AD14B9513B51E4
    # gpg: Good signature from "Markus Koschany <apo at gambaru.de>" [ultimate]
    # gpg:                 aka "Markus Koschany <markus at koschany.net>" [ultimate]
    # gpg:                 aka "Markus Koschany <apo at debian.org>" [ultimate]

 README.TXT                                         |   8 +-
 build.xml                                          |  32 +++---
 .../FurnitureLibraryEditorBootstrap.java           | 116 ++++++++++++++-------
 .../swing/package.properties                       |   2 +-
 4 files changed, 101 insertions(+), 57 deletions(-)

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