[sikuli] 237/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 973ebbada8ae5372238ea22baad9fdd907593102
Merge: 48077da 072a1a0
Author: Raimund Hocke <info at its-me-raiman.de>
Date:   Thu Feb 20 11:29:47 2014 +0100

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

 API/src/main/java/org/sikuli/script/Key.java       |   6 +-
 .../src/main/resources/Lib/sikuli}/sikulix.rb      |   0
 .../org/sikuli/scriptrunner/JRubyScriptRunner.java |   2 +-
 JRuby/src/main/resources/rukuli.rb                 |  10 -
 JRuby/src/main/resources/rukuli/app.rb             |  33 ---
 JRuby/src/main/resources/rukuli/clickable.rb       | 278 ---------------------
 JRuby/src/main/resources/rukuli/config.rb          |  67 -----
 JRuby/src/main/resources/rukuli/exception.rb       |  14 --
 JRuby/src/main/resources/rukuli/key_code.rb        |  21 --
 JRuby/src/main/resources/rukuli/platform.rb        |  12 -
 JRuby/src/main/resources/rukuli/region.rb          |  88 -------
 JRuby/src/main/resources/rukuli/screen.rb          |  20 --
 JRuby/src/main/resources/rukuli/searchable.rb      | 134 ----------
 JRuby/src/main/resources/rukuli/typeable.rb        |  32 ---
 JRuby/src/main/resources/rukuli/version.rb         |   3 -
 15 files changed, 6 insertions(+), 714 deletions(-)


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