[sweethome3d-textures-editor] 01/06: Merge tag 'upstream/1.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-textures-editor.

commit d45a4caf719ffd0b988ceed92bf5877a716a9d69
Merge: 7a695de daa521d
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Mon Aug 26 20:08:03 2013 +0200

    Merge tag 'upstream/1.2'
    
    Upstream version 1.2

 README.TXT                                                     |    8 ++++----
 build.xml                                                      |    2 +-
 src/com/eteks/textureslibraryeditor/swing/package.properties   |    4 ++--
 .../eteks/textureslibraryeditor/swing/package_fr.properties    |    2 +-
 .../textureslibraryeditor/viewcontroller/EditorController.java |    6 ++++++
 5 files changed, 14 insertions(+), 8 deletions(-)

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