This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository sweethome3d.
commit bb16b86892643506ef93afdc37ae6ce55b2ebd64 Merge: bc8a36c e9a557c Author: Markus Koschany <[email protected]> Date: Sun Jan 28 16:29:36 2018 +0100 Update upstream source from tag 'upstream/5.7+dfsg' Update to upstream version '5.7+dfsg' with Debian dir 1090ba6e93b6347c8ffbe1d864ada5cb568566c0 LICENSE.TXT | 2 +- README.TXT | 10 +- THIRDPARTY-LICENSE-JDOM.TXT | 2 +- build.xml | 70 +++++---- deploy/SweetHome3DSplashScreen.jpg | Bin 32034 -> 32044 bytes install/macosx/Sweet Home 3D/Contents/Info.plist | 6 +- install/portable/Info.plist | 6 +- install/portable/README.TXT | 4 +- install/portable/SweetHome3D-windows-x64.xml | 12 +- install/portable/SweetHome3D-windows-x86.xml | 12 +- install/viewer/README.TXT | 6 +- install/windows/installerInnoSetup.iss | 18 +-- .../windows/installerLaunch4j-java3d-1.5.2-x64.xml | 12 +- .../windows/installerLaunch4j-java3d-1.5.2-x86.xml | 12 +- install/windows/installerLaunch4j-x64.xml | 12 +- install/windows/installerLaunch4j-x86.xml | 12 +- install/windows/signedInstallerInnoSetup.iss | 18 +-- src/com/eteks/sweethome3d/MacOSXConfiguration.java | 84 +++++++---- .../eteks/sweethome3d/applet/package.properties | 2 +- .../sweethome3d/io/DefaultFurnitureCatalog.java | 103 ++++++++++++- src/com/eteks/sweethome3d/j3d/OBJMaterial.java | 2 +- .../sweethome3d/model/CatalogDoorOrWindow.java | 62 +++++++- src/com/eteks/sweethome3d/model/CatalogLight.java | 59 +++++++- .../sweethome3d/model/CatalogPieceOfFurniture.java | 164 +++++++++++++++------ .../sweethome3d/model/HomeFurnitureGroup.java | 7 +- .../sweethome3d/model/HomePieceOfFurniture.java | 2 +- .../eteks/sweethome3d/model/UserPreferences.java | 28 ++++ src/com/eteks/sweethome3d/package.properties | 2 +- .../eteks/sweethome3d/resources/splashScreen.jpg | Bin 32034 -> 32044 bytes .../sweethome3d/swing/FileContentManager.java | 82 ++++++++++- .../swing/FurnitureCatalogListPanel.java | 14 +- .../sweethome3d/swing/HomeFurniturePanel.java | 6 +- src/com/eteks/sweethome3d/swing/HomePane.java | 12 ++ src/com/eteks/sweethome3d/swing/PlanComponent.java | 3 + src/com/eteks/sweethome3d/swing/WizardPane.java | 14 ++ 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 | 4 +- .../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 | 4 +- .../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 | 6 +- .../sweethome3d/swing/package_zh_TW.properties | 4 +- .../eteks/sweethome3d/tools/OperatingSystem.java | 9 ++ .../sweethome3d/viewcontroller/HomeController.java | 18 +-- .../viewcontroller/resources/help/fr/tips.html | 4 +- 56 files changed, 722 insertions(+), 243 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sweethome3d.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
