[sweethome3d-furniture-editor] 02/02: Merge tag 'upstream/1.14'

[Gabriele Giacone]

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

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

commit 079d58ab23f79fb9a3f7ec9d6da993472a3a9830
Merge: 06a748d 86037b6
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Wed Jul 9 18:09:31 2014 +0200

    Merge tag 'upstream/1.14'
    
    Upstream version 1.14

 README.TXT                                         |  10 +-
 build.xml                                          |   3 +-
 .../io/FurnitureLibraryFileRecorder.java           |   8 +-
 .../model/FurnitureLibraryUserPreferences.java     |   1 +
 .../swing/FurnitureLibraryTable.java               |  31 +++++--
 .../swing/FurniturePanel.java                      | 101 ++++++++++++++++++---
 .../swing/ImportFurnitureTaskPanel.java            |   4 +-
 .../swing/package.properties                       |   6 +-
 .../swing/package_fr.properties                    |   6 +-
 .../viewcontroller/DefaultCategories_ja.properties |   1 +
 .../viewcontroller/FurnitureController.java        |  88 +++++++++++++-----
 .../viewcontroller/FurnitureLibraryController.java |   4 +-
 12 files changed, 208 insertions(+), 55 deletions(-)

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