[sweethome3d-furniture-editor] 03/04: Merge tag 'upstream/1.12'

[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 259229ee96a2dbd5be87f0376bf91b521bc71b1e
Merge: 389d447 ccccb0e
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Wed Nov 6 00:30:35 2013 +0100

    Merge tag 'upstream/1.12'
    
    Upstream version 1.12

 .settings/org.eclipse.core.resources.prefs         |    2 +
 .settings/org.eclipse.jdt.core.prefs               |   32 ++-
 .settings/org.eclipse.jdt.ui.prefs                 |    3 +-
 README.TXT                                         |    8 +-
 build.xml                                          |    4 +-
 .../io/FurnitureLibraryFileRecorder.java           |   63 +++--
 .../model/FurnitureLibrary.java                    |   68 +++--
 .../model/FurnitureLibraryRecorder.java            |   14 +-
 .../model/FurnitureLibraryUserPreferences.java     |    2 +
 .../furniturelibraryeditor/swing/EditorPane.java   |    4 +
 .../swing/FurnitureLibraryTable.java               |  154 +++++-----
 .../swing/FurniturePanel.java                      |  158 +++++++++--
 .../swing/ImportFurnitureTaskPanel.java            |   23 +-
 .../swing/package.properties                       |   18 +-
 .../swing/package_fr.properties                    |   12 +-
 .../swing/resources/document-merge.png             |  Bin 0 -> 597 bytes
 .../viewcontroller/DefaultCategories.properties    |    1 +
 .../viewcontroller/DefaultCategories_bg.properties |    1 +
 .../viewcontroller/DefaultCategories_de.properties |    1 +
 .../viewcontroller/DefaultCategories_el.properties |    1 +
 .../viewcontroller/DefaultCategories_es.properties |    1 +
 .../viewcontroller/DefaultCategories_fi.properties |    1 +
 .../viewcontroller/DefaultCategories_fr.properties |    1 +
 .../viewcontroller/DefaultCategories_hu.properties |    1 +
 .../viewcontroller/DefaultCategories_it.properties |    1 +
 ...operties => DefaultCategories_pt_PT.properties} |   23 +-
 .../viewcontroller/DefaultCategories_ru.properties |    1 +
 .../viewcontroller/DefaultCategories_sv.properties |    1 +
 .../viewcontroller/DefaultCategories_tr.properties |    1 +
 .../DefaultCategories_zh_TW.properties             |    1 +
 .../viewcontroller/EditorController.java           |   37 ++-
 .../viewcontroller/EditorView.java                 |    2 +-
 .../viewcontroller/FurnitureController.java        |  296 ++++++++++++++------
 .../viewcontroller/package.properties              |    2 +
 .../viewcontroller/package_fr.properties           |    2 +
 35 files changed, 675 insertions(+), 265 deletions(-)

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