[sikuli] 187/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 a7aa31b7e6dde7dd4c675763519f8c2bd6536045
Merge: dc5cc76 e4f5f13
Author: Raimund Hocke <info at its-me-raiman.de>
Date:   Thu Jan 30 20:56:42 2014 +0100

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

 Basics/src/main/java/org/sikuli/basics/ResourceLoader.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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