[sweethome3d] 01/04: Merge tag 'upstream/4.5+dfsg'
Gabriele Giacone
gg0-guest at moszumanska.debian.org
Fri Oct 24 01:19:01 BST 2014
This is an automated email from the git hooks/post-receive script.
gg0-guest pushed a commit to branch master
in repository sweethome3d.
commit da849adf90f25223f309261acf26d3232dbbbc24
Merge: cc0d5d4 2830093
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date: Thu Oct 23 00:53:39 2014 +0200
Merge tag 'upstream/4.5+dfsg'
Upstream version 4.5+dfsg
.classpath | 1 -
ChangeLog | 87 +-
README.TXT | 8 +-
THIRDPARTY-LICENSE-LOADER3DS.TXT | 178 --
build.xml | 27 +-
deploy/SweetHome3D.jnlp | 1 -
deploy/SweetHome3DApplet.html | 6 +-
deploy/SweetHome3DApplet.jnlp | 1 -
deploy/SweetHome3DViewer.html | 4 +-
deploy/SweetHome3DViewer.jnlp | 1 -
install/linux/SweetHome3D | 2 +-
install/macosx/Sweet Home 3D/Contents/Info.plist | 7 +-
install/windows/installerInnoSetup.iss | 14 +-
install/windows/installerLaunch4j.xml | 9 +-
install/windows/signedInstallerInnoSetup.iss | 14 +-
src/com/eteks/sweethome3d/MacOSXConfiguration.java | 19 +-
src/com/eteks/sweethome3d/SweetHome3D.java | 14 +-
.../eteks/sweethome3d/SweetHome3DBootstrap.java | 1 -
.../sweethome3d/applet/HomeAppletController.java | 2 +-
.../eteks/sweethome3d/applet/package.properties | 2 +-
src/com/eteks/sweethome3d/io/Base64.java | 8 +-
.../eteks/sweethome3d/io/ContentDigestManager.java | 51 +-
.../io/ContributedFurnitureCatalog.properties | 4 +-
.../io/ContributedFurnitureCatalog_fr.properties | 6 +-
.../io/ContributedFurnitureCatalog_pt.properties | 22 +-
.../io/DefaultFurnitureCatalog.properties | 10 +-
.../io/DefaultFurnitureCatalog_pt.properties | 38 +-
.../io/DefaultFurnitureCatalog_ru.properties | 8 +-
.../sweethome3d/io/DefaultHomeInputStream.java | 33 +-
.../sweethome3d/io/DefaultHomeOutputStream.java | 21 +-
.../sweethome3d/j3d/HomePieceOfFurniture3D.java | 71 +-
src/com/eteks/sweethome3d/j3d/Max3DSLoader.java | 1803 ++++++++++++++++++++
src/com/eteks/sweethome3d/j3d/ModelManager.java | 45 +-
src/com/eteks/sweethome3d/j3d/TextureManager.java | 2 +-
.../sweethome3d/model/HomeFurnitureGroup.java | 22 +-
.../eteks/sweethome3d/model/UserPreferences.java | 8 +
src/com/eteks/sweethome3d/model/Wall.java | 4 +-
src/com/eteks/sweethome3d/package.properties | 2 +-
.../sweethome3d/swing/CatalogItemToolTip.java | 2 +
.../swing/FurnitureCatalogListPanel.java | 35 +-
.../swing/FurnitureCatalogTransferHandler.java | 14 +-
.../sweethome3d/swing/FurnitureCatalogTree.java | 27 +-
.../eteks/sweethome3d/swing/FurnitureTable.java | 481 +++++-
src/com/eteks/sweethome3d/swing/HomePane.java | 39 +-
.../swing/ImportedFurnitureWizardStepsPanel.java | 13 +-
.../sweethome3d/swing/ModelMaterialsComponent.java | 18 +-
.../sweethome3d/swing/ModelPreviewComponent.java | 4 +-
src/com/eteks/sweethome3d/swing/PlanComponent.java | 5 +-
.../sweethome3d/swing/TextureChoiceComponent.java | 33 +-
src/com/eteks/sweethome3d/swing/package.properties | 2 +-
.../eteks/sweethome3d/swing/package_bg.properties | 1 -
.../eteks/sweethome3d/swing/package_cs.properties | 2 +-
.../eteks/sweethome3d/swing/package_de.properties | 2 +-
.../eteks/sweethome3d/swing/package_el.properties | 1 -
.../eteks/sweethome3d/swing/package_es.properties | 4 +-
.../eteks/sweethome3d/swing/package_fr.properties | 4 +-
.../eteks/sweethome3d/swing/package_hu.properties | 1 -
.../eteks/sweethome3d/swing/package_it.properties | 4 +-
.../eteks/sweethome3d/swing/package_ja.properties | 3 +-
.../eteks/sweethome3d/swing/package_pl.properties | 2 +-
.../eteks/sweethome3d/swing/package_pt.properties | 10 +-
.../eteks/sweethome3d/swing/package_ru.properties | 5 +-
.../eteks/sweethome3d/swing/package_sv.properties | 2 +-
.../eteks/sweethome3d/swing/package_vi.properties | 1 +
.../sweethome3d/swing/package_zh_CN.properties | 3 +-
.../swing/resources/furnitureInformation.png | Bin 0 -> 547 bytes
.../eteks/sweethome3d/tools/OperatingSystem.java | 9 +
.../viewcontroller/FurnitureController.java | 43 +-
.../viewcontroller/HomeController3D.java | 4 +-
.../sweethome3d/viewcontroller/PlanController.java | 4 +-
.../viewcontroller/package_ru.properties | 2 +-
.../resources/help/bg/addingLevels.html | 4 +-
.../resources/help/de/addingLevels.html | 4 +-
.../resources/help/en/addingLevels.html | 4 +-
.../resources/help/en/editingFurniture.html | 8 +-
.../viewcontroller/resources/help/en/tips.html | 5 +-
.../resources/help/en/tocCreating.html | 14 +-
.../resources/help/en/tocEditing.html | 9 +-
.../resources/help/en/tocImporting.html | 10 +-
.../resources/help/es/addingLevels.html | 135 ++
.../resources/help/es/creatingHome.html | 2 +-
.../resources/help/es/editing3DView.html | 2 +-
.../resources/help/es/editingFurniture.html | 17 +-
.../resources/help/es/editingLevels.html | 79 +
.../resources/help/es/editingRooms.html | 2 +-
.../resources/help/es/images/editingLevels.png | Bin 0 -> 15100 bytes
.../resources/help/es/importingBackground.html | 2 +-
.../resources/help/es/tocCreating.html | 11 +-
.../resources/help/es/tocEditing.html | 4 +-
.../viewcontroller/resources/help/es/ui.html | 2 +-
.../resources/help/fr/addingLevels.html | 4 +-
.../resources/help/fr/editingFurniture.html | 10 +-
.../viewcontroller/resources/help/fr/tips.html | 6 +-
.../resources/help/hu/addingLevels.html | 4 +-
.../resources/help/hu/editingFurniture.html | 7 -
.../resources/help/ja/addingLevels.html | 100 ++
.../resources/help/ja/creatingPhotos.html | 152 ++
.../resources/help/ja/creatingVideos.html | 77 +
.../resources/help/ja/editingCompass.html | 96 ++
.../resources/help/ja/editingLevels.html | 56 +
.../resources/help/ja/images/creatingPhotos.jpg | Bin 0 -> 52417 bytes
.../ja/images/creatingPhotosAtPointsOfView.png | Bin 0 -> 17571 bytes
.../resources/help/ja/images/creatingVideos.jpg | Bin 0 -> 48433 bytes
.../resources/help/ja/images/editingCompass.png | Bin 0 -> 13777 bytes
.../resources/help/ja/images/editingLevels.png | Bin 0 -> 12199 bytes
.../help/ja/images/editingVirtualVisitor.png | Bin 0 -> 12817 bytes
.../viewcontroller/resources/help/ja/index.html | 3 +-
.../viewcontroller/resources/help/ja/tips.html | 61 +-
.../resources/help/ja/tocCreating.html | 2 +
.../{tocImporting.html => tocCreatingPhotos.html} | 20 +-
.../resources/help/ja/tocEditing.html | 5 +-
.../resources/help/ja/tocImporting.html | 1 +
.../resources/help/pl/addingFurniture.html | 48 +-
.../resources/help/pl/creatingHome.html | 16 +-
.../resources/help/pl/drawingDimensions.html | 47 +-
.../resources/help/pl/drawingWalls.html | 38 +-
.../resources/help/pl/editing3DView.html | 54 +-
.../resources/help/pl/editingDimensions.html | 29 +-
.../resources/help/pl/editingFurniture.html | 112 +-
.../resources/help/pl/editingPreferences.html | 29 +-
.../resources/help/pl/editingWalls.html | 7 +-
.../resources/help/pl/images/editingMaterials.png | Bin 0 -> 12723 bytes
.../resources/help/pl/importingBackground.html | 4 +
.../resources/help/pl/importingFurniture.html | 24 +-
.../viewcontroller/resources/help/pl/index.html | 6 +-
.../viewcontroller/resources/help/pl/ui.html | 2 +-
.../resources/help/pt/addingLevels.html | 97 ++
.../resources/help/pt/editingLevels.html | 60 +
.../resources/help/pt/images/editingLevels.png | Bin 0 -> 15542 bytes
.../viewcontroller/resources/help/pt/index.html | 2 +-
.../resources/help/pt/tocCreating.html | 1 +
.../resources/help/pt/tocEditing.html | 1 +
.../resources/help/ru/addingFurniture.html | 75 +-
.../resources/help/ru/addingLevels.html | 122 ++
.../resources/help/ru/addingTexts.html | 78 +
.../resources/help/ru/creatingHome.html | 28 +-
.../resources/help/ru/creatingPhotos.html | 182 ++
.../resources/help/ru/creatingVideos.html | 95 ++
.../resources/help/ru/drawingDimensions.html | 75 +-
.../resources/help/ru/drawingRooms.html | 169 ++
.../resources/help/ru/drawingWalls.html | 62 +-
.../resources/help/ru/editing3DView.html | 99 +-
.../resources/help/ru/editingCompass.html | 101 ++
.../resources/help/ru/editingDimensions.html | 54 +-
.../resources/help/ru/editingFurniture.html | 378 ++--
.../resources/help/ru/editingLevels.html | 68 +
.../resources/help/ru/editingPreferences.html | 95 +-
.../resources/help/ru/editingRooms.html | 189 ++
.../resources/help/ru/editingWalls.html | 80 +-
.../resources/help/ru/images/addingText.png | Bin 0 -> 4815 bytes
.../resources/help/ru/images/creatingPhotos.jpg | Bin 0 -> 41553 bytes
.../ru/images/creatingPhotosAtPointsOfView.png | Bin 0 -> 18439 bytes
.../resources/help/ru/images/creatingVideos.jpg | Bin 0 -> 35345 bytes
.../resources/help/ru/images/editingCompass.png | Bin 0 -> 17768 bytes
.../resources/help/ru/images/editingLevels.png | Bin 0 -> 14904 bytes
.../resources/help/ru/images/editingMaterials.png | Bin 0 -> 11690 bytes
.../resources/help/ru/images/editingRooms.png | Bin 0 -> 20111 bytes
.../help/ru/images/editingVirtualVisitor.png | Bin 0 -> 13375 bytes
.../resources/help/ru/importingBackground.html | 42 +-
.../resources/help/ru/importingFurniture.html | 90 +-
.../viewcontroller/resources/help/ru/index.html | 5 +-
.../resources/help/ru/printingHome.html | 68 +-
.../resources/help/ru/savingHome.html | 54 +-
.../viewcontroller/resources/help/ru/tips.html | 544 +++---
.../resources/help/ru/tocCreating.html | 36 +-
.../resources/help/ru/tocCreatingPhotos.html | 48 +
.../resources/help/ru/tocEditing.html | 34 +-
.../resources/help/ru/tocImporting.html | 27 +-
.../viewcontroller/resources/help/ru/tocStart.html | 31 +-
.../viewcontroller/resources/help/ru/ui.html | 45 +-
.../resources/help/sv/addingLevels.html | 4 +-
.../sweethome3d/junit/HomeControllerTest.java | 2 +-
.../sweethome3d/junit/HomeFileRecorderTest.java | 19 +-
.../sweethome3d/junit/PackageDependenciesTest.java | 2 -
...meInValidZipWithContentDigestsAndNoContent.sh3d | Bin 0 -> 5075 bytes
175 files changed, 6178 insertions(+), 1654 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