Skip to content

Commit

Permalink
Merge branch '2.0' of github.com:kwhat/jnativehook into 2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
kwhat committed Nov 2, 2015
2 parents ad4a30a + 454d850 commit 059805e
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## ChangeLog

**JNativeHook 2.0.3 (Oct 27, 2015)**
**JNativeHook 2.0.3 (Oct 28, 2015)**
* Added support for media keys on OS X.
* Added wiki pages to the project.
* Fixed caps-lock key release on OS X.
Expand Down
2 changes: 1 addition & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## News

**JNativeHook 2.0.3 Maintenance Release (Oct 27, 2015)**
**JNativeHook 2.0.3 Maintenance Release (Oct 28, 2015)**

Maintenance release 3 addresses a few small issues across all supported platforms. Please see the [ChangeLog](ChangeLog.md) for more information. Work has now started on version 2.1 of the library. Future work will include better language support for X11 and possibly Wayland support.

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ demonstration of raw output for all available native events. To run the
application simply execute the jar file provided. Source code available at
[src/java/org/jnativehook/example/NativeHookDemo.java](src/java/org/jnativehook/example/NativeHookDemo.java).

## Sample Code
## Example Code
* [Global Keyboard Listener](wiki/examples/Keyboard.md)
* [Global Mouse Listener](wiki/examples/Mouse.md)
* [Global Mouse Wheel Listener](wiki/examples/MouseWheel.md)
Expand Down
5 changes: 5 additions & 0 deletions wiki/examples/LibraryLoading.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ public class UrlLibraryLocator implements NativeLibraryLocator {
libFile.deleteOnExit();

FileUtils.copyURLToFile(libUrl, libFile);

ArrayList<libFile> list = new ArrayList(1);
list.add(file);

return list;
}
}
```

0 comments on commit 059805e

Please sign in to comment.