[sikuli] 272/385: Merge pull request #16 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 a04841e7d2492e2d7e5c4d0b81b7172e331df767
Merge: 30c6bc1 ddbf941
Author: Raimund Hocke <rmhdevelop at me.com>
Date:   Sun Feb 23 18:08:10 2014 +0100

    Merge pull request #16 from rssdev10/master
    
    RubyScript

 Basics/src/main/resources/Lib/sikulix.rb               |  4 ++--
 IDE/src/main/java/org/sikuli/ide/PatternWindow.java    | 18 +++++++++++++++++-
 .../org/sikuli/scriptrunner/JRubyScriptRunner.java     | 17 +++++++++++------
 3 files changed, 30 insertions(+), 9 deletions(-)

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