[sweethome3d-furniture] 03/03: Merge tag 'upstream/1.4'

Gabriele Giacone gg0-guest at moszumanska.debian.org
Wed Jul 9 14:04:46 UTC 2014


This is an automated email from the git hooks/post-receive script.

gg0-guest pushed a commit to branch master
in repository sweethome3d-furniture.

commit 4557a7bb325c9a9ae8a8d028489dd18dd8c91bfc
Merge: e751705 8cfd988
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Sun May 18 21:12:50 2014 +0200

    Merge tag 'upstream/1.4'
    
    Upstream version 1.4

 BlendSwap-CC-0/PluginFurnitureCatalog.properties   |    211 +-
 .../PluginFurnitureCatalog_bg.properties           |     50 +-
 .../PluginFurnitureCatalog_cs.properties           |     42 +-
 .../PluginFurnitureCatalog_de.properties           |     40 +
 .../PluginFurnitureCatalog_el.properties           |     40 +
 .../PluginFurnitureCatalog_es.properties           |     40 +
 .../PluginFurnitureCatalog_fi.properties           |     40 +
 .../PluginFurnitureCatalog_fr.properties           |     54 +-
 .../PluginFurnitureCatalog_hu.properties           |     42 +-
 .../PluginFurnitureCatalog_it.properties           |     42 +-
 .../PluginFurnitureCatalog_ja.properties           |     42 +-
 .../PluginFurnitureCatalog_nl.properties           |     42 +-
 .../PluginFurnitureCatalog_pl.properties           |     42 +-
 .../PluginFurnitureCatalog_pt.properties           |     40 +
 .../PluginFurnitureCatalog_pt_PT.properties        |     44 +-
 .../PluginFurnitureCatalog_ru.properties           |     56 +-
 .../PluginFurnitureCatalog_sv.properties           |     40 +
 .../PluginFurnitureCatalog_tr.properties           |     40 +
 .../PluginFurnitureCatalog_vi.properties           |     42 +-
 .../PluginFurnitureCatalog_zh_CN.properties        |     42 +-
 .../PluginFurnitureCatalog_zh_TW.properties        |     40 +
 BlendSwap-CC-0/blendswap-cc-0/ammoBox.png          |    Bin 0 -> 18081 bytes
 .../ammoBox/72801 - Ammo Box - License.html        |    237 +
 BlendSwap-CC-0/blendswap-cc-0/ammoBox/ammoBox.mtl  |     12 +
 BlendSwap-CC-0/blendswap-cc-0/ammoBox/ammoBox.obj  |    172 +
 BlendSwap-CC-0/blendswap-cc-0/ammoBox/box.jpg      |    Bin 0 -> 66603 bytes
 BlendSwap-CC-0/blendswap-cc-0/barrel.png           |    Bin 0 -> 18813 bytes
 .../barrel/71925 - Low poly barrel - License.html  |    235 +
 BlendSwap-CC-0/blendswap-cc-0/barrel/barrel.mtl    |     22 +
 BlendSwap-CC-0/blendswap-cc-0/barrel/barrel.obj    |   4128 +
 .../blendswap-cc-0/barrel/barrelRing.jpg           |    Bin 0 -> 27305 bytes
 BlendSwap-CC-0/blendswap-cc-0/barrel/barrelS_D.jpg |    Bin 0 -> 50981 bytes
 BlendSwap-CC-0/blendswap-cc-0/basketball.png       |    Bin 0 -> 17202 bytes
 .../basketball/BLENDSWAP_LICENSE.txt               |     77 +
 .../basketball/Basketball-ColorMap.jpg             |    Bin 0 -> 31423 bytes
 .../blendswap-cc-0/basketball/basketball.mtl       |     12 +
 .../blendswap-cc-0/basketball/basketball.obj       |   3015 +
 BlendSwap-CC-0/blendswap-cc-0/crate.png            |    Bin 0 -> 23069 bytes
 .../crate/71943 - Low poly Crate - License.html    |    236 +
 BlendSwap-CC-0/blendswap-cc-0/crate/crate.jpg      |    Bin 0 -> 33951 bytes
 BlendSwap-CC-0/blendswap-cc-0/crate/crate.mtl      |     12 +
 BlendSwap-CC-0/blendswap-cc-0/crate/crate.obj      |   1197 +
 BlendSwap-CC-0/blendswap-cc-0/cupboard.png         |    Bin 0 -> 7429 bytes
 .../cupboard/71419 - Cupboard - License.html       |    236 +
 .../blendswap-cc-0/cupboard/cupboard.mtl           |     83 +
 .../blendswap-cc-0/cupboard/cupboard.obj           |   9064 +
 BlendSwap-CC-0/blendswap-cc-0/desk.png             |    Bin 0 -> 12612 bytes
 .../blendswap-cc-0/desk/BLENDSWAP_LICENSE.txt      |     77 +
 BlendSwap-CC-0/blendswap-cc-0/desk/desk.mtl        |     47 +
 BlendSwap-CC-0/blendswap-cc-0/desk/desk.obj        |   4727 +
 BlendSwap-CC-0/blendswap-cc-0/electricGuitar.png   |    Bin 0 -> 6810 bytes
 .../electricGuitar/BLENDSWAP_LICENSE.txt           |     77 +
 .../electricGuitar/electricGuitar.mtl              |     83 +
 .../electricGuitar/electricGuitar.obj              |  76319 +++++++++
 BlendSwap-CC-0/blendswap-cc-0/littlePlant.png      |    Bin 0 -> 18529 bytes
 .../littlePlant/72403 - Flower pot - License.html  |    237 +
 BlendSwap-CC-0/blendswap-cc-0/littlePlant/leaf.jpg |    Bin 0 -> 5271 bytes
 .../blendswap-cc-0/littlePlant/littlePlant.mtl     |     30 +
 .../blendswap-cc-0/littlePlant/littlePlant.obj     |   5091 +
 BlendSwap-CC-0/blendswap-cc-0/littlePlant/mutt.jpg |    Bin 0 -> 16658 bytes
 BlendSwap-CC-0/blendswap-cc-0/littlePlant/pot.jpg  |    Bin 0 -> 16494 bytes
 BlendSwap-CC-0/blendswap-cc-0/sillaBlanca.png      |    Bin 0 -> 8124 bytes
 .../sillaBlanca/BLENDSWAP_LICENSE.txt              |     77 +
 .../blendswap-cc-0/sillaBlanca/sillaBlanca.mtl     |     22 +
 .../blendswap-cc-0/sillaBlanca/sillaBlanca.obj     |  12842 ++
 BlendSwap-CC-0/blendswap-cc-0/umbrellaFolded.png   |    Bin 0 -> 8347 bytes
 .../72458 - Folded Umbrella - License.html         |    235 +
 .../umbrellaFolded/umbrellaFolded.mtl              |     47 +
 .../umbrellaFolded/umbrellaFolded.obj              |  49847 ++++++
 BlendSwap-CC-BY/PluginFurnitureCatalog.properties  |    288 +-
 .../PluginFurnitureCatalog_bg.properties           |     66 +-
 .../PluginFurnitureCatalog_cs.properties           |     62 +-
 .../PluginFurnitureCatalog_de.properties           |     60 +
 .../PluginFurnitureCatalog_el.properties           |     60 +
 .../PluginFurnitureCatalog_es.properties           |     60 +
 .../PluginFurnitureCatalog_fi.properties           |     60 +
 .../PluginFurnitureCatalog_fr.properties           |     78 +-
 .../PluginFurnitureCatalog_hu.properties           |     62 +-
 .../PluginFurnitureCatalog_it.properties           |     62 +-
 .../PluginFurnitureCatalog_ja.properties           |     62 +-
 .../PluginFurnitureCatalog_nl.properties           |     62 +-
 .../PluginFurnitureCatalog_pl.properties           |     62 +-
 .../PluginFurnitureCatalog_pt.properties           |     60 +
 .../PluginFurnitureCatalog_pt_PT.properties        |     60 +
 .../PluginFurnitureCatalog_ru.properties           |     64 +-
 .../PluginFurnitureCatalog_sv.properties           |     60 +
 .../PluginFurnitureCatalog_tr.properties           |     60 +
 .../PluginFurnitureCatalog_vi.properties           |     62 +-
 .../PluginFurnitureCatalog_zh_CN.properties        |     62 +-
 .../PluginFurnitureCatalog_zh_TW.properties        |     60 +
 BlendSwap-CC-BY/blendswap-cc-by/ballonFoot.png     |    Bin 0 -> 14738 bytes
 .../ballonFoot/BLENDSWAP_LICENSE.txt               |     79 +
 .../blendswap-cc-by/ballonFoot/ballonFoot.mtl      |     20 +
 .../blendswap-cc-by/ballonFoot/ballonFoot.obj      |  11537 ++
 BlendSwap-CC-BY/blendswap-cc-by/bonecoDeNeve.png   |    Bin 0 -> 7022 bytes
 .../72242 - Boneco de neve - License.html          |    237 +
 .../blendswap-cc-by/bonecoDeNeve/bonecoDeNeve.mtl  |     56 +
 .../blendswap-cc-by/bonecoDeNeve/bonecoDeNeve.obj  |  42053 +++++
 BlendSwap-CC-BY/blendswap-cc-by/breadBox.png       |    Bin 0 -> 8485 bytes
 .../blendswap-cc-by/breadBox/BLENDSWAP_LICENSE.txt |     79 +
 .../blendswap-cc-by/breadBox/breadBox.mtl          |     31 +
 .../blendswap-cc-by/breadBox/breadBox.obj          |   6978 +
 .../blendswap-cc-by/breadBox/pan-corteza-1.jpg     |    Bin 0 -> 24020 bytes
 .../blendswap-cc-by/breadBox/pan-corteza.jpg       |    Bin 0 -> 17443 bytes
 BlendSwap-CC-BY/blendswap-cc-by/chessboard.png     |    Bin 0 -> 17797 bytes
 .../chessboard/73022 - Chessboard - License.html   |    236 +
 .../blendswap-cc-by/chessboard/chessboard.mtl      |     47 +
 .../blendswap-cc-by/chessboard/chessboard.obj      | 128366 ++++++++++++++
 BlendSwap-CC-BY/blendswap-cc-by/chest.png          |    Bin 0 -> 17940 bytes
 ...4 - Chest of drawers and cabinet - License.html |    235 +
 BlendSwap-CC-BY/blendswap-cc-by/chest/chest.mtl    |     21 +
 BlendSwap-CC-BY/blendswap-cc-by/chest/chest.obj    |  10037 ++
 BlendSwap-CC-BY/blendswap-cc-by/chest/wood.jpg     |    Bin 0 -> 29403 bytes
 BlendSwap-CC-BY/blendswap-cc-by/kitchenScale.png   |    Bin 0 -> 14236 bytes
 .../blendswap-cc-by/kitchenScale/0318430_l.jpg     |    Bin 0 -> 22433 bytes
 .../kitchenScale/BLENDSWAP_LICENSE.txt             |     79 +
 .../blendswap-cc-by/kitchenScale/kitchenScale.mtl  |     30 +
 .../blendswap-cc-by/kitchenScale/kitchenScale.obj  |   2114 +
 BlendSwap-CC-BY/blendswap-cc-by/lettoCloud.png     |    Bin 0 -> 11898 bytes
 .../lettoCloud/BLENDSWAP_LICENSE.txt               |     80 +
 .../blendswap-cc-by/lettoCloud/lettoCloud.mtl      |     65 +
 .../blendswap-cc-by/lettoCloud/lettoCloud.obj      |  63205 +++++++
 .../blendswap-cc-by/mediumIndoorPlant.png          |    Bin 0 -> 19946 bytes
 .../mediumIndoorPlant/BLENDSWAP_LICENSE.txt        |     79 +
 .../blendswap-cc-by/mediumIndoorPlant/leaf.jpg     |    Bin 0 -> 31375 bytes
 .../mediumIndoorPlant/mediumIndoorPlant.mtl        |     85 +
 .../mediumIndoorPlant/mediumIndoorPlant.obj        | 159921 ++++++++++++++++++
 BlendSwap-CC-BY/blendswap-cc-by/officeTable.png    |    Bin 0 -> 11124 bytes
 .../officeTable/BLENDSWAP_LICENSE.txt              |     79 +
 .../officeTable/blendswap_table_material.jpg       |    Bin 0 -> 38173 bytes
 .../blendswap_table_material_drawer_done.png       |    Bin 0 -> 1376 bytes
 .../blendswap-cc-by/officeTable/officeTable.mtl    |     31 +
 .../blendswap-cc-by/officeTable/officeTable.obj    |   5287 +
 BlendSwap-CC-BY/blendswap-cc-by/sofa2.png          |    Bin 0 -> 7891 bytes
 .../71907 - Basic modern livingroom - License.html |    235 +
 BlendSwap-CC-BY/blendswap-cc-by/sofa2/sofa2.mtl    |     20 +
 BlendSwap-CC-BY/blendswap-cc-by/sofa2/sofa2.obj    |  15406 ++
 BlendSwap-CC-BY/blendswap-cc-by/spatifilum.png     |    Bin 0 -> 26567 bytes
 .../72551 - Living room plant - License.html       |    237 +
 .../blendswap-cc-by/spatifilum/spatifilum.mtl      |     39 +
 .../blendswap-cc-by/spatifilum/spatifilum.obj      | 152562 +++++++++++++++++
 .../blendswap-cc-by/spatifilum/spatifilumList.jpg  |    Bin 0 -> 38072 bytes
 BlendSwap-CC-BY/blendswap-cc-by/tvStand.png        |    Bin 0 -> 10596 bytes
 .../blendswap-cc-by/tvStand/BLENDSWAP_LICENSE.txt  |     80 +
 .../blendswap-cc-by/tvStand/tvStand.mtl            |     40 +
 .../blendswap-cc-by/tvStand/tvStand.obj            |    586 +
 BlendSwap-CC-BY/blendswap-cc-by/tvStand/wood.jpg   |    Bin 0 -> 20326 bytes
 BlendSwap-CC-BY/blendswap-cc-by/utensilsPot.png    |    Bin 0 -> 5293 bytes
 .../utensilsPot/BLENDSWAP_LICENSE.txt              |     79 +
 .../blendswap-cc-by/utensilsPot/utensilsPot.mtl    |     20 +
 .../blendswap-cc-by/utensilsPot/utensilsPot.obj    |   2828 +
 .../blendswap-cc-by/wirelessOfficePhone3.png       |    Bin 0 -> 12401 bytes
 .../wirelessOfficePhone3/BLENDSWAP_LICENSE.txt     |     79 +
 .../wirelessOfficePhone3/wirelessOfficePhone3.mtl  |     22 +
 .../wirelessOfficePhone3/wirelessOfficePhone3.obj  |    785 +
 .../wirelessOfficePhone_col.jpg                    |    Bin 0 -> 40957 bytes
 BlendSwap-CC-BY/blendswap-cc-by/yuccaPlant.png     |    Bin 0 -> 15310 bytes
 .../yuccaPlant/BLENDSWAP_LICENSE.txt               |     80 +
 .../blendswap-cc-by/yuccaPlant/grass_blade.jpg     |    Bin 0 -> 23001 bytes
 .../blendswap-cc-by/yuccaPlant/wood.jpg            |    Bin 0 -> 28000 bytes
 .../blendswap-cc-by/yuccaPlant/yuccaPlant.mtl      |    115 +
 .../blendswap-cc-by/yuccaPlant/yuccaPlant.obj      |  76108 +++++++++
 .../blendswap-cc-by/yuccaPlant/yuccaTrunk.jpg      |    Bin 0 -> 23449 bytes
 KatorLegaz/PluginFurnitureCatalog.properties       |     63 +-
 KatorLegaz/PluginFurnitureCatalog_fr.properties    |     20 +-
 KatorLegaz/PluginFurnitureCatalog_pt_PT.properties |      7 +-
 .../katorlegaz/filing-cabinet/filing-cabinet.obj   |   1156 +-
 .../utility-shelving/utility-shelving.obj          |  47631 ++++--
 Reallusion/PluginFurnitureCatalog.properties       |      4 +-
 Reallusion/PluginFurnitureCatalog_pt_PT.properties |      4 +-
 Scopia/LICENSE.TXT                                 |     65 +-
 Scopia/PluginFurnitureCatalog.properties           |    666 +-
 Scopia/PluginFurnitureCatalog_bg.properties        |    162 +-
 Scopia/PluginFurnitureCatalog_cs.properties        |    142 +-
 Scopia/PluginFurnitureCatalog_de.properties        |    140 +
 Scopia/PluginFurnitureCatalog_el.properties        |    142 +-
 Scopia/PluginFurnitureCatalog_es.properties        |    142 +-
 Scopia/PluginFurnitureCatalog_fi.properties        |    140 +
 Scopia/PluginFurnitureCatalog_fr.properties        |    160 +-
 Scopia/PluginFurnitureCatalog_hu.properties        |    142 +-
 Scopia/PluginFurnitureCatalog_it.properties        |    142 +-
 Scopia/PluginFurnitureCatalog_ja.properties        |    142 +-
 Scopia/PluginFurnitureCatalog_nl.properties        |    162 +-
 Scopia/PluginFurnitureCatalog_pl.properties        |    142 +-
 Scopia/PluginFurnitureCatalog_pt.properties        |    140 +
 Scopia/PluginFurnitureCatalog_pt_PT.properties     |    148 +-
 Scopia/PluginFurnitureCatalog_ru.properties        |    144 +-
 Scopia/PluginFurnitureCatalog_sv.properties        |    139 +
 Scopia/PluginFurnitureCatalog_tr.properties        |    140 +
 Scopia/PluginFurnitureCatalog_vi.properties        |    142 +-
 Scopia/PluginFurnitureCatalog_zh_CN.properties     |    142 +-
 Scopia/PluginFurnitureCatalog_zh_TW.properties     |    142 +-
 Scopia/scopia/baby_high_chair.png                  |    Bin 0 -> 13305 bytes
 Scopia/scopia/baby_high_chair/baby_high_chair.mtl  |     39 +
 Scopia/scopia/baby_high_chair/baby_high_chair.obj  |   5755 +
 .../baby_high_chair/texture-baby-high-chair.jpg    |    Bin 0 -> 111907 bytes
 Scopia/scopia/basic_camera.png                     |    Bin 0 -> 13663 bytes
 Scopia/scopia/basic_camera/basic_camera.mtl        |     21 +
 Scopia/scopia/basic_camera/basic_camera.obj        |   3019 +
 Scopia/scopia/basic_camera/basic_camera_map.jpg    |    Bin 0 -> 34471 bytes
 Scopia/scopia/basketball_net_and_board.png         |    Bin 0 -> 12255 bytes
 .../basketball_net_and_board.mtl                   |     40 +
 .../basketball_net_and_board.obj                   |   5877 +
 .../basketball_net_and_board_texture.jpg           |    Bin 0 -> 11762 bytes
 Scopia/scopia/birthday_cake.png                    |    Bin 0 -> 19529 bytes
 Scopia/scopia/birthday_cake/birthday_cake.mtl      |     89 +
 Scopia/scopia/birthday_cake/birthday_cake.obj      |  13408 ++
 .../scopia/birthday_cake/cake_chocolat_texture.jpg |    Bin 0 -> 31373 bytes
 Scopia/scopia/birthday_cake/cake_texture.jpg       |    Bin 0 -> 25159 bytes
 Scopia/scopia/birthday_cake/flame.png              |    Bin 0 -> 3861 bytes
 .../scopia/birthday_cake/happy_birthday_text.png   |    Bin 0 -> 11322 bytes
 Scopia/scopia/birthday_cake/velas.png              |    Bin 0 -> 1887 bytes
 Scopia/scopia/broom.png                            |    Bin 0 -> 1848 bytes
 Scopia/scopia/broom/broom.mtl                      |     21 +
 Scopia/scopia/broom/broom.obj                      |   1330 +
 Scopia/scopia/broom/broom_texture.jpg              |    Bin 0 -> 5423 bytes
 Scopia/scopia/child_swing.png                      |    Bin 0 -> 10287 bytes
 Scopia/scopia/child_swing/child_swing.mtl          |     57 +
 Scopia/scopia/child_swing/child_swing.obj          |   9346 +
 Scopia/scopia/child_swing/pine-wood.jpg            |    Bin 0 -> 79392 bytes
 Scopia/scopia/christmas_tree.png                   |    Bin 0 -> 16147 bytes
 Scopia/scopia/christmas_tree/branch.png            |    Bin 0 -> 134446 bytes
 Scopia/scopia/christmas_tree/christmas_tree.mtl    |     57 +
 Scopia/scopia/christmas_tree/christmas_tree.obj    |  36877 ++++
 Scopia/scopia/clothes_washing_machine.png          |    Bin 0 -> 9377 bytes
 .../clothes_washing_machine.jpg                    |    Bin 0 -> 13155 bytes
 .../clothes_washing_machine.mtl                    |     85 +
 .../clothes_washing_machine.obj                    |   2390 +
 Scopia/scopia/coffee_table/coffee_table.mtl        |     17 +-
 Scopia/scopia/coffee_table/coffee_table.obj        |   1018 +-
 Scopia/scopia/curtain.png                          |    Bin 0 -> 9770 bytes
 Scopia/scopia/curtain/beige_pattern.jpg            |    Bin 0 -> 117953 bytes
 Scopia/scopia/curtain/curtain.mtl                  |     12 +
 Scopia/scopia/curtain/curtain.obj                  |   4949 +
 Scopia/scopia/dart_game.png                        |    Bin 0 -> 20327 bytes
 Scopia/scopia/dart_game/dart_game.mtl              |     40 +
 Scopia/scopia/dart_game/dart_game.obj              |   2142 +
 Scopia/scopia/dart_game/dart_game_texture.jpg      |    Bin 0 -> 59640 bytes
 Scopia/scopia/dryer_machine.png                    |    Bin 0 -> 9573 bytes
 Scopia/scopia/dryer_machine/dryer_machine.jpg      |    Bin 0 -> 7891 bytes
 Scopia/scopia/dryer_machine/dryer_machine.mtl      |     85 +
 Scopia/scopia/dryer_machine/dryer_machine.obj      |   1725 +
 Scopia/scopia/electric_water_heater.png            |    Bin 0 -> 5835 bytes
 .../electric_water_heater.mtl                      |     49 +
 .../electric_water_heater.obj                      |   3004 +
 .../electric_water_heater_256.jpg                  |    Bin 0 -> 8517 bytes
 Scopia/scopia/electric_water_heater_big.png        |    Bin 0 -> 4846 bytes
 .../electric_water_heater_256.jpg                  |    Bin 0 -> 8517 bytes
 .../electric_water_heater_big.mtl                  |     85 +
 .../electric_water_heater_big.obj                  |   6966 +
 Scopia/scopia/external-unity-air-conditioning.png  |    Bin 0 -> 16726 bytes
 .../ext-air-conditioning-baked.jpg                 |    Bin 0 -> 177879 bytes
 .../external-unity-air-conditioning.mtl            |     12 +
 .../external-unity-air-conditioning.obj            |    744 +
 Scopia/scopia/farola1.png                          |    Bin 1805 -> 3173 bytes
 Scopia/scopia/farola1/farola1.obj                  |  20563 +--
 Scopia/scopia/ficus.png                            |    Bin 0 -> 14478 bytes
 Scopia/scopia/ficus/barc2.jpg                      |    Bin 0 -> 43367 bytes
 Scopia/scopia/ficus/ficus.mtl                      |     50 +
 Scopia/scopia/ficus/ficus.obj                      |  86093 ++++++++++
 Scopia/scopia/ficus/leaves_texture2.jpg            |    Bin 0 -> 4112 bytes
 Scopia/scopia/ficus/soil.jpg                       |    Bin 0 -> 27131 bytes
 Scopia/scopia/flipper.png                          |    Bin 0 -> 12443 bytes
 Scopia/scopia/flipper/flipper.mtl                  |     85 +
 Scopia/scopia/flipper/flipper.obj                  |   1486 +
 Scopia/scopia/flipper/flipper_texture.jpg          |    Bin 0 -> 81021 bytes
 Scopia/scopia/folded_clothes.png                   |    Bin 0 -> 14539 bytes
 Scopia/scopia/folded_clothes/blue-fabric.jpg       |    Bin 0 -> 101350 bytes
 Scopia/scopia/folded_clothes/folded_clothes.mtl    |     57 +
 Scopia/scopia/folded_clothes/folded_clothes.obj    |   3411 +
 Scopia/scopia/gaz_water_heater.png                 |    Bin 0 -> 1626 bytes
 .../scopia/gaz_water_heater/gaz_water_heater.mtl   |     61 +
 .../scopia/gaz_water_heater/gaz_water_heater.obj   |   2337 +
 Scopia/scopia/gaz_water_heater/map-and-flame.jpg   |    Bin 0 -> 17316 bytes
 Scopia/scopia/inkjet_and_scanner_printer.png       |    Bin 0 -> 7176 bytes
 .../inkjet_and_scanner_printer.jpg                 |    Bin 0 -> 8242 bytes
 .../inkjet_and_scanner_printer.mtl                 |     21 +
 .../inkjet_and_scanner_printer.obj                 |   1585 +
 Scopia/scopia/intercom.png                         |    Bin 0 -> 6082 bytes
 Scopia/scopia/intercom/intercom.mtl                |     49 +
 Scopia/scopia/intercom/intercom.obj                |   3335 +
 Scopia/scopia/intercom/intercom_wire.jpg           |    Bin 0 -> 29645 bytes
 Scopia/scopia/intercom_with_screen.png             |    Bin 0 -> 10062 bytes
 .../scopia/intercom_with_screen/intercom_wire.jpg  |    Bin 0 -> 29645 bytes
 .../intercom_with_screen/intercom_with_screen.mtl  |     50 +
 .../intercom_with_screen/intercom_with_screen.obj  |   4407 +
 .../intercom_with_screen_texture.jpg               |    Bin 0 -> 10843 bytes
 Scopia/scopia/internal-unity-air-conditioning.png  |    Bin 0 -> 4942 bytes
 .../internal-air-conditioning-baked2.png           |    Bin 0 -> 172840 bytes
 .../internal-unity-air-conditioning.mtl            |     12 +
 .../internal-unity-air-conditioning.obj            |    437 +
 Scopia/scopia/jacuzzi.png                          |    Bin 0 -> 18516 bytes
 Scopia/scopia/jacuzzi/jacuzzi-screen.jpg           |    Bin 0 -> 9240 bytes
 Scopia/scopia/jacuzzi/jacuzzi.mtl                  |     86 +
 Scopia/scopia/jacuzzi/jacuzzi.obj                  |   7416 +
 Scopia/scopia/jacuzzi/jacuzzi_normal_map.jpg       |    Bin 0 -> 46956 bytes
 Scopia/scopia/jacuzzi/paneling-for-interior.jpg    |    Bin 0 -> 56415 bytes
 Scopia/scopia/japanese_style_screen.png            |    Bin 0 -> 13191 bytes
 .../japanese_style_screen.mtl                      |     21 +
 .../japanese_style_screen.obj                      |   1897 +
 Scopia/scopia/japanese_style_screen/wood.jpg       |    Bin 0 -> 18272 bytes
 Scopia/scopia/leather_sofa/leather_sofa.obj        | 115779 ++++++-------
 Scopia/scopia/letters_box.png                      |    Bin 0 -> 10662 bytes
 Scopia/scopia/letters_box/letters_box.mtl          |     30 +
 Scopia/scopia/letters_box/letters_box.obj          |    905 +
 Scopia/scopia/letters_box/letters_box_logo.png     |    Bin 0 -> 2200 bytes
 Scopia/scopia/mini_stereo.png                      |    Bin 0 -> 10524 bytes
 Scopia/scopia/mini_stereo/mini_stereo.mtl          |     31 +
 Scopia/scopia/mini_stereo/mini_stereo.obj          |   2556 +
 Scopia/scopia/mini_stereo/mini_stereo_texture.jpg  |    Bin 0 -> 34891 bytes
 Scopia/scopia/mini_stereo/wood-map-speakers.jpg    |    Bin 0 -> 63994 bytes
 Scopia/scopia/mp3_base_for_ipad.png                |    Bin 0 -> 8708 bytes
 .../scopia/mp3_base_for_ipad/mp3_base_for_ipad.mtl |     50 +
 .../scopia/mp3_base_for_ipad/mp3_base_for_ipad.obj |   2342 +
 .../mp3_base_for_ipad_texture.jpg                  |    Bin 0 -> 91690 bytes
 Scopia/scopia/puff.png                             |    Bin 0 -> 15483 bytes
 Scopia/scopia/puff/puff.mtl                        |     12 +
 Scopia/scopia/puff/puff.obj                        |   1754 +
 Scopia/scopia/puff/puff_texture.jpg                |    Bin 0 -> 19609 bytes
 Scopia/scopia/reflex_camera.png                    |    Bin 0 -> 13172 bytes
 Scopia/scopia/reflex_camera/reflex_camera.mtl      |     22 +
 Scopia/scopia/reflex_camera/reflex_camera.obj      |   4607 +
 Scopia/scopia/reflex_camera/reflex_camera_map.jpg  |    Bin 0 -> 37888 bytes
 .../reflex_camera/reflex_camera_objective.jpg      |    Bin 0 -> 43750 bytes
 Scopia/scopia/shovel.png                           |    Bin 0 -> 7186 bytes
 Scopia/scopia/shovel/shovel.mtl                    |     20 +
 Scopia/scopia/shovel/shovel.obj                    |    910 +
 Scopia/scopia/sneakers.png                         |    Bin 0 -> 19549 bytes
 Scopia/scopia/sneakers/sneaker_texture.jpg         |    Bin 0 -> 52652 bytes
 Scopia/scopia/sneakers/sneakers.mtl                |     58 +
 Scopia/scopia/sneakers/sneakers.obj                |   8367 +
 Scopia/scopia/stereo_amplifier.png                 |    Bin 0 -> 7234 bytes
 .../scopia/stereo_amplifier/stereo_amplifier.mtl   |     39 +
 .../scopia/stereo_amplifier/stereo_amplifier.obj   |   1981 +
 .../stereo_amplifier/stereo_amplifier_texture.jpg  |    Bin 0 -> 44073 bytes
 Scopia/scopia/water_cooler.png                     |    Bin 0 -> 5350 bytes
 .../water_cooler/uv-map-colored-water-cooler.jpg   |    Bin 0 -> 24102 bytes
 Scopia/scopia/water_cooler/water_cooler.mtl        |     21 +
 Scopia/scopia/water_cooler/water_cooler.obj        |   4770 +
 Scopia/scopia/woman_shoes.png                      |    Bin 0 -> 9383 bytes
 Scopia/scopia/woman_shoes/woman_shoes.mtl          |     29 +
 Scopia/scopia/woman_shoes/woman_shoes.obj          |   2201 +
 Scopia/scopia/wood_logs.png                        |    Bin 0 -> 21943 bytes
 Scopia/scopia/wood_logs/wood_logs.mtl              |     12 +
 Scopia/scopia/wood_logs/wood_logs.obj              |   1476 +
 Scopia/scopia/wood_logs/wood_logs_texture.jpg      |    Bin 0 -> 156387 bytes
 346 files changed, 1190563 insertions(+), 94125 deletions(-)

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



More information about the pkg-java-commits mailing list