[sikuli] 351/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 c8406df2f5489f4fd26c96d76e97e3fd1fb41901
Merge: 80b5174 6a01e5e
Author: Raimund Hocke <info at its-me-raiman.de>
Date:   Thu Apr 10 14:23:58 2014 +0200

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

 API/src/main/java/org/sikuli/script/Mouse.java     |  3 +-
 .../org/sikuli/script/OverlayCapturePrompt.java    |  1 -
 API/src/main/java/org/sikuli/script/Region.java    | 81 +++++++++++++++++-----
 API/src/main/java/org/sikuli/script/Screen.java    |  2 +-
 .../java/org/sikuli/script/ScreenHighlighter.java  | 50 +++++++++++--
 .../src/main/java/org/sikuli/basics/RunSetup.java  |  2 -
 IDE/src/main/java/org/sikuli/ide/SikuliIDE.java    |  1 +
 7 files changed, 111 insertions(+), 29 deletions(-)

diff --cc API/src/main/java/org/sikuli/script/Region.java
index 076c0d1,968b3a6..870e564
mode 100755,100644..100644
--- a/API/src/main/java/org/sikuli/script/Region.java
+++ b/API/src/main/java/org/sikuli/script/Region.java

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