[sweethome3d] 02/04: Merge tag 'upstream/4.3+dfsg'

[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.

commit 05463f8b30622189fa7e227f25507c1875d64cf2
Merge: 17b9524 f01984f
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Tue Jan 28 02:26:36 2014 +0100

    Merge tag 'upstream/4.3+dfsg'
    
    Upstream version 4.3+dfsg

 ChangeLog                                          |  34 +-
 LICENSE.TXT                                        |   2 +-
 README.TXT                                         |  12 +-
 build.xml                                          | 145 +++++++--
 deploy/SweetHome3DSplashScreen.jpg                 | Bin 29823 -> 29820 bytes
 install/macosx/Sweet Home 3D/Contents/Info.plist   |   6 +-
 install/windows/installerInnoSetup.iss             |  33 +-
 install/windows/installerLaunch4j.xml              |  10 +-
 install/windows/signedInstallerInnoSetup.iss       |  37 ++-
 src/com/eteks/sweethome3d/MacOSXConfiguration.java |  23 +-
 src/com/eteks/sweethome3d/SweetHome3D.java         |   4 +
 .../eteks/sweethome3d/SweetHome3DBootstrap.java    |   1 -
 src/com/eteks/sweethome3d/applet/ViewerHelper.java |   6 +
 .../eteks/sweethome3d/applet/package.properties    |   2 +-
 .../io/DefaultFurnitureCatalog_de.properties       |  14 +-
 src/com/eteks/sweethome3d/j3d/DAELoader.java       |   2 +-
 src/com/eteks/sweethome3d/j3d/Ground3D.java        |   4 +-
 .../sweethome3d/j3d/HomePieceOfFurniture3D.java    |  30 +-
 src/com/eteks/sweethome3d/j3d/OBJLoader.java       |  47 +--
 src/com/eteks/sweethome3d/j3d/Object3DBranch.java  |  93 ++++--
 src/com/eteks/sweethome3d/j3d/Room3D.java          |   5 +-
 src/com/eteks/sweethome3d/j3d/Wall3D.java          |   2 +-
 src/com/eteks/sweethome3d/package.properties       |   2 +-
 .../eteks/sweethome3d/resources/splashScreen.jpg   | Bin 29823 -> 29820 bytes
 .../swing/FurnitureCatalogListPanel.java           |  80 ++---
 .../sweethome3d/swing/FurnitureCatalogTree.java    |  11 +-
 .../eteks/sweethome3d/swing/FurnitureTable.java    |  16 +
 .../eteks/sweethome3d/swing/FurnitureToolTip.java  |  85 ++++-
 .../eteks/sweethome3d/swing/HomeComponent3D.java   |  49 +--
 src/com/eteks/sweethome3d/swing/HomePane.java      | 150 ++++++---
 .../swing/ImportedFurnitureWizardStepsPanel.java   | 362 ++++++++-------------
 .../sweethome3d/swing/ModelPreviewComponent.java   | 129 ++++----
 .../sweethome3d/swing/MultipleLevelsPlanPanel.java |  19 +-
 src/com/eteks/sweethome3d/swing/PhotoPanel.java    |   2 +-
 src/com/eteks/sweethome3d/swing/PlanComponent.java |  51 ++-
 src/com/eteks/sweethome3d/swing/package.properties |   2 +-
 .../eteks/sweethome3d/swing/package_bg.properties  |   4 +-
 .../eteks/sweethome3d/swing/package_cs.properties  |   2 +-
 .../eteks/sweethome3d/swing/package_de.properties  |   2 +-
 .../eteks/sweethome3d/swing/package_el.properties  |   2 +-
 .../eteks/sweethome3d/swing/package_es.properties  |   2 +-
 .../eteks/sweethome3d/swing/package_fr.properties  |   2 +-
 .../eteks/sweethome3d/swing/package_hu.properties  |   4 +-
 .../eteks/sweethome3d/swing/package_it.properties  |   2 +-
 .../eteks/sweethome3d/swing/package_ja.properties  |   4 +-
 .../eteks/sweethome3d/swing/package_pl.properties  |   2 +-
 .../eteks/sweethome3d/swing/package_pt.properties  |   4 +-
 .../eteks/sweethome3d/swing/package_ru.properties  |   2 +-
 .../eteks/sweethome3d/swing/package_sv.properties  |   2 +-
 .../eteks/sweethome3d/swing/package_vi.properties  |   2 +-
 .../sweethome3d/swing/package_zh_CN.properties     |   2 +-
 .../viewcontroller/resources/help/en/ui.html       |  32 +-
 .../viewcontroller/resources/help/fr/ui.html       |  17 +-
 .../eteks/sweethome3d/junit/HomeCameraTest.java    |   1 -
 54 files changed, 944 insertions(+), 614 deletions(-)

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