[sikuli] 348/385: Merge pull request #21 from sjoblomj/master

[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 985ae3ced27dda203d9ca86678d5bac68f676889
Merge: 23d0c08 c73ad88
Author: Raimund Hocke <rmhdevelop at me.com>
Date:   Thu Apr 10 09:02:51 2014 +0200

    Merge pull request #21 from sjoblomj/master
    
    Added option to change highlight colour

 .../org/sikuli/script/OverlayCapturePrompt.java    |  1 -
 API/src/main/java/org/sikuli/script/Region.java    | 75 ++++++++++++++++------
 API/src/main/java/org/sikuli/script/Screen.java    |  2 +-
 .../java/org/sikuli/script/ScreenHighlighter.java  | 17 ++++-
 4 files changed, 71 insertions(+), 24 deletions(-)

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