[sweethome3d-textures-editor] 03/03: Merge tag 'upstream/1.3'

[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 12bef475f62465858aea2921866b0e391924eb4a
Merge: 046a75d b476afc
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Wed Nov 6 00:38:25 2013 +0100

    Merge tag 'upstream/1.3'
    
    Upstream version 1.3

 .settings/org.eclipse.jdt.core.prefs               |   32 ++++++-
 .settings/org.eclipse.jdt.ui.prefs                 |    3 +-
 README.TXT                                         |    8 +-
 build.xml                                          |    2 +-
 .../io/TexturesLibraryFileRecorder.java            |   37 ++++++--
 .../model/TexturesLibraryRecorder.java             |   14 ++-
 .../textureslibraryeditor/swing/EditorPane.java    |    4 +
 .../swing/TexturesLibraryTable.java                |   39 +++++---
 .../textureslibraryeditor/swing/TexturesPanel.java |   32 ++++---
 .../textureslibraryeditor/swing/package.properties |    8 +-
 .../swing/package_fr.properties                    |    4 +
 .../swing/resources/document-merge.png             |  Bin 0 -> 597 bytes
 .../viewcontroller/EditorController.java           |   37 +++++++-
 .../viewcontroller/EditorView.java                 |    2 +-
 .../viewcontroller/TexturesController.java         |   98 +++++++++++++-------
 .../viewcontroller/package.properties              |    2 +
 .../viewcontroller/package_fr.properties           |    2 +
 17 files changed, 238 insertions(+), 86 deletions(-)

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