Skip to content

Commit

Permalink
Merge pull request #142 from dmauro/development
Browse files Browse the repository at this point in the history
Merging dev into master for v2.1.5
  • Loading branch information
dmauro authored Mar 5, 2018
2 parents ec2de8f + 9379767 commit 70a58fb
Show file tree
Hide file tree
Showing 9 changed files with 121 additions and 86 deletions.
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Keypress
========
Version 2.1.4
Version 2.1.5

Keypress is a robust keyboard input capturing Javascript utility
focused on input for games. For details and documentation, please
Expand All @@ -15,6 +15,10 @@ released under the Apache License, version 2.0
**What's new**
---------------

2.1.5

* Fixed a bug that would prevent unregistering meta combos by name rather than reference. Thanks to [bichotll](https://github.com/bichotll), [aubincleme](https://github.com/aubincleme), and [mhuebert](https://github.com/mhuebert) for help [spotting](https://github.com/dmauro/Keypress/issues/133) and [fixing](https://github.com/dmauro/Keypress/pull/141) the issue.

2.1.4

* Remove unexpected debugger
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Keypress",
"main": "keypress-2.1.4.min.js",
"main": "keypress-2.1.5.min.js",
"homepage": "https://github.com/dmauro/Keypress",
"authors": [
"David Mauro <[email protected]>"
Expand Down
4 changes: 2 additions & 2 deletions coffee-compiler.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
VERSION="2.1.4"
YEAR="2016"
VERSION="2.1.5"
YEAR="2018"
cd "$( cd "$( dirname "$0" )" && pwd )"
coffee -c keypress.coffee
java -jar compiler.jar --js keypress.js --js_output_file keypress-$VERSION.min.js
Expand Down
33 changes: 0 additions & 33 deletions keypress-2.1.4.min.js

This file was deleted.

Loading

0 comments on commit 70a58fb

Please sign in to comment.