[sikuli] 306/385: Merge pull request #17 from rssdev10/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 ee7b3ade6320b1f7945f911eb6ce5d5190fc3ead
Merge: 4e44265 f593215
Author: Raimund Hocke <rmhdevelop at me.com>
Date:   Thu Feb 27 08:50:21 2014 +0100

    Merge pull request #17 from rssdev10/master
    
    jRuby interactive mode

 Basics/src/main/resources/Lib/sikulix.rb           |  6 ++++
 .../org/sikuli/scriptrunner/JRubyScriptRunner.java | 41 ++++++++++++++++++++--
 2 files changed, 44 insertions(+), 3 deletions(-)

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