[sweethome3d-furniture] 01/04: Merge tag 'upstream/1.4.2'

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

commit 0275e86d557106eb91c3792fdc3f2ff3b87bc67c
Merge: 4557a7b 411fd55
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Thu Oct 23 18:21:59 2014 +0200

    Merge tag 'upstream/1.4.2'
    
    Upstream version 1.4.2

 BlendSwap-CC-0/PluginFurnitureCatalog.properties   |   28 +-
 .../PluginFurnitureCatalog_fr.properties           |   14 +-
 .../PluginFurnitureCatalog_ja.properties           |  162 +-
 .../PluginFurnitureCatalog_nl.properties           |   41 +-
 .../PluginFurnitureCatalog_pt.properties           |  120 +-
 .../PluginFurnitureCatalog_pt_PT.properties        |    2 +-
 BlendSwap-CC-0/blendswap-cc-0/crate/crate.obj      | 2142 ++++++++++----------
 BlendSwap-CC-BY/PluginFurnitureCatalog.properties  |   30 +-
 .../PluginFurnitureCatalog_fr.properties           |    8 +-
 .../PluginFurnitureCatalog_ja.properties           |  172 +-
 .../PluginFurnitureCatalog_nl.properties           |   42 +-
 .../PluginFurnitureCatalog_pt.properties           |   49 +-
 KatorLegaz/PluginFurnitureCatalog.properties       |   32 +-
 KatorLegaz/PluginFurnitureCatalog_fr.properties    |    2 +-
 KatorLegaz/PluginFurnitureCatalog_ja.properties    |   38 +-
 KatorLegaz/PluginFurnitureCatalog_pt.properties    |   82 +-
 Reallusion/PluginFurnitureCatalog.properties       |    2 +-
 Reallusion/PluginFurnitureCatalog_ja.properties    |   68 +-
 Reallusion/PluginFurnitureCatalog_pt.properties    |   98 +-
 Scopia/PluginFurnitureCatalog.properties           |   72 +-
 Scopia/PluginFurnitureCatalog_fr.properties        |   14 +-
 Scopia/PluginFurnitureCatalog_ja.properties        |  182 +-
 Scopia/PluginFurnitureCatalog_pt.properties        |  172 +-
 23 files changed, 1798 insertions(+), 1774 deletions(-)

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