[sikuli] 11/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 6c591e83b35081515f39c8f0d7ef56df97381b57
Merge: 6cf5301 2545bd5
Author: Raimund Hocke <rmhdevelop at me.com>
Date:   Tue Dec 24 11:02:48 2013 +0100

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

 README.md | 24 ++++++++++++++++++++++--
 pom.xml   | 31 +++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 2 deletions(-)

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