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

[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 6c3c3814d74f3ce89635665d2d04acf7d4cde25b
Merge: 612381e 9cd5d71
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Sun May 18 21:03:11 2014 +0200

    Merge tag 'upstream/1.4'
    
    Upstream version 1.4

 Contributions/PluginFurnitureCatalog.properties    |  293 +-
 Contributions/PluginFurnitureCatalog_fr.properties |   48 +-
 .../PluginFurnitureCatalog_pt_PT.properties        |   28 +-
 Contributions/contributions/pcstul/pcstul.obj      | 3858 ++++++++++----------
 LucaPresidente/PluginFurnitureCatalog.properties   |   46 +-
 .../PluginFurnitureCatalog_fr.properties           |    2 +-
 Trees/PluginFurnitureCatalog.properties            |    9 +-
 7 files changed, 2330 insertions(+), 1954 deletions(-)

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