[sikuli] 367/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 5e2af13986aae179f3f92100e26b460591b25ef6
Merge: f694657 8e29264
Author: Raimund Hocke <rmhdevelop at me.com>
Date:   Thu Apr 24 12:17:08 2014 +0200

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

 API/src/main/java/org/sikuli/script/Match.java     | 11 +++-----
 API/src/main/java/org/sikuli/script/Region.java    | 20 ++++++++++++++
 Basics/src/main/resources/Lib/sikuli/Screen.py     |  7 ++---
 Basics/src/main/resources/Lib/sikuli/Sikuli.py     |  2 +-
 Basics/src/main/resources/Lib/sikulix.rb           | 31 ++++++++++++++++++++++
 .../main/java/org/sikuli/guide/SikuliGuide.java    | 16 +++++++----
 .../org/sikuli/scriptrunner/JRubyScriptRunner.java |  7 ++++-
 7 files changed, 76 insertions(+), 18 deletions(-)

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