This is an automated email from the git hooks/post-receive script. pini pushed a commit to branch master in repository sikuli.
commit 1812548e95ce03a558bb79c8e2d03416de8e7c5d Merge: 552b8b7 df2a976 Author: Gilles Filippini <[email protected]> Date: Sun Jun 29 22:51:29 2014 +0200 Merge branch 'upstream' .gitignore | 3 + API/pom.xml | 2 +- API/src/main/java/org/sikuli/script/Image.java | 37 +- API/src/main/java/org/sikuli/script/ImagePath.java | 11 +- API/src/main/java/org/sikuli/script/Key.java | 4 +- API/src/main/java/org/sikuli/script/Mouse.java | 107 ++- .../org/sikuli/script/OverlayCapturePrompt.java | 168 ++--- .../sikuli/script/OverlayTransparentWindow.java | 1 + API/src/main/java/org/sikuli/script/Region.java | 207 +++--- .../main/java/org/sikuli/script/RobotDesktop.java | 52 +- API/src/main/java/org/sikuli/script/Screen.java | 136 +++- .../main/java/org/sikuli/script/ScreenUnion.java | 33 +- API/src/main/java/org/sikuli/script/SikuliX.java | 13 +- Basics/pom.xml | 8 +- .../main/java/org/sikuli/basics/FileManager.java | 12 +- .../main/java/org/sikuli/basics/HotkeyManager.java | 160 +++- .../java/org/sikuli/basics/ResourceLoader.java | 4 +- .../src/main/java/org/sikuli/basics/RunSetup.java | 310 ++++---- .../src/main/java/org/sikuli/basics/Settings.java | 826 +++++++++++---------- .../main/java/org/sikuli/basics/SikuliScript.java | 32 +- .../src/main/java/org/sikuli/basics/SikuliX.java | 3 + .../org/sikuli/basics/WindowsHotkeyManager.java | 6 - Basics/src/main/resources/Lib/sikuli/Screen.py | 6 +- Basics/src/main/resources/Lib/sikuli/Sikuli.py | 6 + Basics/src/main/resources/Lib/sikulix.rb | 167 +++-- .../src/main/resources/Settings/sikulixversion.txt | 6 + IDE/src/main/java/org/sikuli/ide/EditorPane.java | 56 +- .../main/java/org/sikuli/ide/PreferencesWin.java | 11 +- IDE/src/main/java/org/sikuli/ide/SikuliIDE.java | 83 +-- IDE/src/main/resources/i18n/IDE_tamil.properties | 182 +++++ .../org/sikuli/scriptrunner/JRubyScriptRunner.java | 3 +- Jygments4SikuliX/pom.xml | 3 +- .../sikuli/scriptrunner/JythonScriptRunner.java | 8 +- Natives/src/main/native/Vision/tessocr.cpp | 2 + README.md | 15 +- Setup/pom.xml | 6 +- Tesseract4SikuliX/pom.xml | 3 +- collectJars | 18 +- collectJarsJenkins | 23 + nightlybuildindex.html | 63 ++ nightlybuildindextail.html | 25 + pom.xml | 15 +- 42 files changed, 1772 insertions(+), 1064 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sikuli.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
