[sweethome3d-furniture-nonfree] 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-nonfree.

commit 72c6d68645b24fdab0ea6f397d82ac5ed9519f85
Merge: 6c3c381 18e98d3
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Thu Oct 23 18:18:42 2014 +0200

    Merge tag 'upstream/1.4.2'
    
    Upstream version 1.4.2

 Contributions/PluginFurnitureCatalog.properties    |  71 ++--
 Contributions/PluginFurnitureCatalog_fr.properties |  14 +-
 Contributions/PluginFurnitureCatalog_ja.properties | 252 +++++------
 Contributions/PluginFurnitureCatalog_pt.properties | 469 ++++++++++-----------
 LucaPresidente/PluginFurnitureCatalog.properties   |  10 +-
 .../PluginFurnitureCatalog_ja.properties           | 182 ++++----
 .../PluginFurnitureCatalog_pt.properties           | 216 +++++-----
 Trees/PluginFurnitureCatalog.properties            |   2 +-
 Trees/PluginFurnitureCatalog_pt.properties         |  58 +--
 9 files changed, 639 insertions(+), 635 deletions(-)

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