[sweethome3d-furniture-editor] 01/06: Merge tag 'upstream/1.11'

[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 c742355602eebe33859abeab7e67707278d247cd
Merge: 495e19b 8ee6752
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Mon Aug 26 19:47:16 2013 +0200

    Merge tag 'upstream/1.11'
    
    Upstream version 1.11

 README.TXT                                          |    8 ++++----
 build.xml                                           |    2 +-
 .../FurnitureLibraryEditorBootstrap.java            |   19 ++++++++++++++-----
 .../furniturelibraryeditor/swing/package.properties |    4 ++--
 .../swing/package_fr.properties                     |    2 +-
 .../viewcontroller/DefaultCategories_ru.properties  |    2 +-
 .../viewcontroller/EditorController.java            |    6 ++++++
 .../viewcontroller/FurnitureController.java         |    2 +-
 8 files changed, 30 insertions(+), 15 deletions(-)

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