[sikuli] 316/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 64690a41e78200e43c4a9dbe3a637add31bcbeb6
Merge: 4c46efb 950d126
Author: Raimund Hocke <rmhdevelop at me.com>
Date:   Sat Mar 1 21:27:50 2014 +0100

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

 Basics/src/main/java/org/sikuli/basics/RunSetup.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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