[sikuli] 218/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 bb4527d71679e7e1aa7009e2bc2aa3c578e78292
Merge: 7a5cf33 3278198
Author: Raimund Hocke <info at its-me-raiman.de>
Date:   Mon Feb 17 17:52:25 2014 +0100

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

 API/pom.xml                                        |   2 +-
 IDE/src/main/java/org/sikuli/ide/SikuliIDE.java    |   6 +-
 .../org/sikuli/scriptrunner/JRubyScriptRunner.java |  50 ++----
 JRuby/src/main/resources/sikulix.rb                | 181 +++++++++++++--------
 4 files changed, 137 insertions(+), 102 deletions(-)


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