[sweethome3d] 04/08: Merge tag 'upstream/5.4+dfsg'
Markus Koschany
apo at moszumanska.debian.org
Sun Mar 5 23:27:02 UTC 2017
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository sweethome3d.
commit d541a990cbf06b46f98823e1a6fcaef603b58797
Merge: 0f09950 ee07849
Author: Markus Koschany <apo at debian.org>
Date: Sun Mar 5 23:41:24 2017 +0100
Merge tag 'upstream/5.4+dfsg'
Upstream version 5.4+dfsg
# gpg: Signatur vom So 05 Mär 2017 23:41:23 CET
# gpg: mittels RSA-Schlüssel ACF3D088EF32EDEF6A1A835FD9AD14B9513B51E4
# gpg: Korrekte Signatur von "Markus Koschany <apo at gambaru.de>" [ultimativ]
# gpg: alias "Markus Koschany <markus at koschany.net>" [ultimativ]
# gpg: alias "Markus Koschany <apo at debian.org>" [ultimativ]
ChangeLog | 15 +
LICENSE.TXT | 2 +-
README.TXT | 6 +-
build.xml | 315 ++++++++++-----------
deploy/SweetHome3DSplashScreen.jpg | Bin 32040 -> 32034 bytes
install/macosx/Sweet Home 3D/Contents/Info.plist | 6 +-
install/portable/Info.plist | 6 +-
install/portable/README.TXT | 2 +-
install/portable/SweetHome3D-windows-x64.xml | 8 +-
install/portable/SweetHome3D-windows-x86.xml | 8 +-
install/viewer/README.TXT | 2 +-
install/windows/installerInnoSetup.iss | 12 +-
install/windows/installerLaunch4j-x64.xml | 8 +-
install/windows/installerLaunch4j-x86.xml | 8 +-
install/windows/signedInstallerInnoSetup.iss | 12 +-
src/com/eteks/sweethome3d/HomeFramePane.java | 92 +++---
.../eteks/sweethome3d/applet/package.properties | 2 +-
src/com/eteks/sweethome3d/j3d/Ground3D.java | 31 +-
.../sweethome3d/j3d/HomePieceOfFurniture3D.java | 103 ++++---
src/com/eteks/sweethome3d/j3d/Object3DBranch.java | 55 +++-
src/com/eteks/sweethome3d/j3d/Room3D.java | 24 +-
src/com/eteks/sweethome3d/j3d/TextureManager.java | 8 +-
src/com/eteks/sweethome3d/j3d/Wall3D.java | 46 ++-
src/com/eteks/sweethome3d/model/Baseboard.java | 8 +-
src/com/eteks/sweethome3d/model/Camera.java | 1 +
.../sweethome3d/model/CatalogPieceOfFurniture.java | 12 +-
.../eteks/sweethome3d/model/CatalogTexture.java | 8 +-
src/com/eteks/sweethome3d/model/TextStyle.java | 8 +-
src/com/eteks/sweethome3d/package.properties | 2 +-
.../eteks/sweethome3d/resources/splashScreen.jpg | Bin 32040 -> 32034 bytes
.../sweethome3d/swing/ObserverCameraPanel.java | 2 +-
src/com/eteks/sweethome3d/swing/PlanComponent.java | 3 +-
.../eteks/sweethome3d/swing/SwingViewFactory.java | 2 +-
src/com/eteks/sweethome3d/swing/package.properties | 4 +-
.../eteks/sweethome3d/swing/package_bg.properties | 4 +-
.../eteks/sweethome3d/swing/package_cs.properties | 4 +-
.../eteks/sweethome3d/swing/package_de.properties | 4 +-
.../eteks/sweethome3d/swing/package_el.properties | 4 +-
.../eteks/sweethome3d/swing/package_es.properties | 4 +-
.../eteks/sweethome3d/swing/package_fr.properties | 4 +-
.../eteks/sweethome3d/swing/package_hu.properties | 8 +-
.../eteks/sweethome3d/swing/package_it.properties | 4 +-
.../eteks/sweethome3d/swing/package_ja.properties | 4 +-
.../eteks/sweethome3d/swing/package_nl.properties | 4 +-
.../eteks/sweethome3d/swing/package_pl.properties | 8 +-
.../eteks/sweethome3d/swing/package_pt.properties | 4 +-
.../eteks/sweethome3d/swing/package_ru.properties | 4 +-
.../eteks/sweethome3d/swing/package_sv.properties | 4 +-
.../eteks/sweethome3d/swing/package_vi.properties | 4 +-
.../sweethome3d/swing/package_zh_CN.properties | 4 +-
.../sweethome3d/swing/package_zh_TW.properties | 8 +-
.../sweethome3d/viewcontroller/HomeController.java | 19 +-
.../viewcontroller/HomeController3D.java | 7 +-
.../sweethome3d/viewcontroller/PlanController.java | 17 +-
.../sweethome3d/viewcontroller/RoomController.java | 18 +-
.../viewcontroller/resources/help/en/index.html | 2 +-
56 files changed, 499 insertions(+), 465 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sweethome3d.git
More information about the pkg-java-commits
mailing list