[sikuli] 124/385: Merge pull request #6 from iirekm/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 b867fc550c7d92b9ee33343bd3260116994b8da0
Merge: 19eabbc 80bb309
Author: Raimund Hocke <rmhdevelop at me.com>
Date:   Mon Jan 6 08:44:26 2014 -0800

    Merge pull request #6 from iirekm/master
    
    Simplified native library loading on Windows

 Basics/pom.xml                                     |   9 +-
 .../java/org/sikuli/basics/ResourceLoader.java     | 133 ++++++++-------------
 Natives/pom.xml                                    |   9 ++
 .../src/main/java/org/sikuli/natives/WinUtil.java  |   7 ++
 4 files changed, 74 insertions(+), 84 deletions(-)

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