[sikuli] 381/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 2215a487f7a319dc9764423e06e4de922455e7a1
Merge: d5bf5f9 065d6bf
Author: Raimund Hocke <info at its-me-raiman.de>
Date:   Mon May 5 08:17:14 2014 +0200

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

 .gitignore                                         |   2 +
 API/src/main/java/org/sikuli/script/Key.java       |   9 +-
 API/src/main/java/org/sikuli/script/Mouse.java     |   8 +
 .../windows/TheBuildProcess/00_natives_build.txt   |  15 --
 .../build/windows/TheBuildProcess/11_Vision/mymake |   4 +-
 Libs/build/windows/TheBuildProcess/msys32.bat      | 218 +++++++++++++++++++++
 Libs/build/windows/TheBuildProcess/msys64.bat      | 218 +++++++++++++++++++++
 .../META-INF/libs/windows/libs32/VisionProxy.dll   | Bin 358926 -> 366606 bytes
 .../META-INF/libs/windows/libs64/VisionProxy.dll   | Bin 472064 -> 481792 bytes
 9 files changed, 456 insertions(+), 18 deletions(-)

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