[sikuli] 44/385: Merge pull request #3 from niknah/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 850f08cd98c1a0e2a6fcbb6b525277fd21501e3d
Merge: f997494 8c94a80
Author: Raimund Hocke <rmhdevelop at me.com>
Date:   Fri Dec 27 02:16:40 2013 -0800

    Merge pull request #3 from niknah/master
    
    Fixes for linux

 .../java/org/sikuli/basics/ResourceLoader.java     |   2 +-
 IDE/pom.xml                                        |   2 +-
 .../sikuli/scriptrunner/JythonScriptRunner.java    |   4 +-
 Natives/pom.xml                                    |  31 ++++++
 Natives/src/main/native/Vision/makeVisionProxy     | 106 +++++++++++++++++++++
 5 files changed, 141 insertions(+), 4 deletions(-)

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