[sikuli] 323/385: Merge branch 'master' of https://github.com/RaiMan/SikuliX-2014

[Gilles Filippini]

This is an automated email from the git hooks/post-receive script.

pini pushed a commit to tag upstream/1.1.0_beta1
in repository sikuli.

commit 9651746f2c276baf8ec7352fbaee722e4fd1f4d3
Merge: c5e773f 64b006e
Author: Raimund Hocke <rmhdevelop at me.com>
Date:   Thu Mar 6 06:33:56 2014 +0100

    Merge branch 'master' of https://github.com/RaiMan/SikuliX-2014

 .../main/java/org/sikuli/basics/FileManager.java   | 22 ++++++++++++++++++++++
 .../src/main/java/org/sikuli/basics/Settings.java  | 22 +++-------------------
 IDE/src/main/java/org/sikuli/ide/SikuliIDE.java    |  2 +-
 3 files changed, 26 insertions(+), 20 deletions(-)

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