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

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

commit e436db27f2f5e9cb82f5a01158249eba9e2ce4c7
Merge: 079d58a c1dd616
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Fri Oct 24 04:18:42 2014 +0200

    Merge tag 'upstream/1.15'
    
    Upstream version 1.15

 README.TXT                                                 | 14 +++++++-------
 build.xml                                                  |  8 +++++---
 .../FurnitureLibraryEditorBootstrap.java                   |  3 +--
 .../eteks/furniturelibraryeditor/swing/package.properties  |  4 ++--
 .../furniturelibraryeditor/swing/package_fr.properties     |  2 +-
 .../viewcontroller/DefaultCategories_pt.properties         |  1 +
 6 files changed, 17 insertions(+), 15 deletions(-)

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