[sikuli] 121/385: Merge pull request #1 from RaiMan/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 15aaaf9c01b1a824d78e90e1dacf185ad8a90e4d
Merge: 6a787ac 2760c04
Author: iirekm <iirekm at gmail.com>
Date:   Mon Jan 6 06:02:13 2014 -0800

    Merge pull request #1 from RaiMan/master
    
    Pull recent changes in SikuliX

 .gitignore                                         |  1 +
 API/pom.xml                                        | 12 +++---
 Basics/pom.xml                                     |  8 +---
 .../java/org/sikuli/basics/ResourceLoader.java     | 46 ++++++++++----------
 .../src/main/java/org/sikuli/basics/SikuliX.java   |  2 +-
 Guide/pom.xml                                      |  6 +--
 IDE/pom.xml                                        | 15 ++++---
 Jython/pom.xml                                     |  6 +--
 Libs/pom.xml                                       |  5 ++-
 MacApp/pom.xml                                     |  5 ++-
 Natives/pom.xml                                    |  4 +-
 OpenCV/pom.xml                                     |  4 +-
 README.md                                          | 16 +++++--
 Remote/pom.xml                                     |  4 +-
 Tesseract/pom.xml                                  |  4 +-
 pom.xml                                            | 50 +++++++++++-----------
 16 files changed, 99 insertions(+), 89 deletions(-)

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