[sikuli] 112/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 b59af0c6c2f01b6a7817a362543ebed6fb0610f9
Merge: cf76be9 4292aea
Author: Raimund Hocke <rmhdevelop at me.com>
Date:   Mon Jan 6 09:59:54 2014 +0100

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

 API/src/main/java/org/sikuli/script/Finder.java    |   4 +-
 API/src/main/java/org/sikuli/script/Image.java     |  59 +++--
 .../main/java/org/sikuli/script/ImageGroup.java    |  14 +-
 .../main/java/org/sikuli/script/ImageLocator.java  |  72 +++---
 API/src/main/java/org/sikuli/script/ImagePath.java |   2 +-
 API/src/main/java/org/sikuli/script/Location.java  |  24 +-
 API/src/main/java/org/sikuli/script/Match.java     |   8 +-
 API/src/main/java/org/sikuli/script/Mouse.java     |  46 ++--
 API/src/main/java/org/sikuli/script/Observer.java  |  20 +-
 .../java/org/sikuli/script/ObserverCallBack.java   |  14 +-
 API/src/main/java/org/sikuli/script/Pattern.java   |  14 +-
 API/src/main/java/org/sikuli/script/Region.java    | 270 ++++++++++-----------
 API/src/main/java/org/sikuli/script/Screen.java    |   8 +-
 .../main/java/org/sikuli/script/ScreenImage.java   |   3 -
 Basics/src/main/java/org/sikuli/basics/Debug.java  |  40 +--
 .../main/java/org/sikuli/basics/FileManager.java   |  23 +-
 .../main/java/org/sikuli/basics/GifDecoder.java    |   6 +-
 .../main/java/org/sikuli/basics/IScriptRunner.java |   1 -
 .../java/org/sikuli/basics/ResourceLoader.java     |   2 -
 .../src/main/java/org/sikuli/basics/Settings.java  |  38 +--
 .../src/main/java/org/sikuli/basics/SikuliX.java   |  14 +-
 .../java/org/sikuli/basics/SikuliXforJython.java   |   6 +-
 .../main/java/org/sikuli/guide/ComponentMover.java |   6 +-
 .../org/sikuli/guide/SikuliGuideComponent.java     |   4 +-
 IDE/pom.xml                                        |   7 +
 .../java/org/sikuli/jython/PythonIndentation.java  |   2 +-
 .../main/java/org/sikuli/jython/PythonState.java   |   4 +-
 README.md                                          |   8 +-
 pom.xml                                            |  23 ++
 29 files changed, 381 insertions(+), 361 deletions(-)


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