Skip to content

Commit ae057d1

Browse files
jakesgordonjakesgordon
committed
Merge branch 'v3'
2 parents c0333e6 + 1861308 commit ae057d1

99 files changed

Lines changed: 14124 additions & 5002 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.ackrc‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
--ignore-dir=coverage
2+
--ignore-dir=node_modules
3+
--ignore-dir=.nyc_output
4+

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
11
node_modules
2+
coverage
3+
.nyc_output
4+
*.swp

‎LICENSE‎

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,10 @@
1-
Copyright (c) 2012, 2013, 2014, 2015, 2016, 2017, Jake Gordon and contributors
1+
Copyright (c) Jake Gordon
22

3-
Permission is hereby granted, free of charge, to any person obtaining a copy
4-
of this software and associated documentation files (the "Software"), to deal
5-
in the Software without restriction, including without limitation the rights
6-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
7-
copies of the Software, and to permit persons to whom the Software is
8-
furnished to do so, subject to the following conditions:
3+
"javascript-state-machine" is dual-licensed:
94

10-
The above copyright notice and this permission notice shall be included in all
11-
copies or substantial portions of the Software.
12-
13-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
19-
SOFTWARE.
5+
* "javascript-state-machine" is available as an Open Source project licensed under the terms
6+
of the LGPLv3 license. Please see <http://www.gnu.org/licenses/lgpl-3.0.html>
7+
for license text.
208

9+
* "javascript-state-machine" is also available under a commercial license (with support). Please
10+
read docs/commercial-license.md and contact jake@codeincomplete.com for more details.

0 commit comments

Comments
 (0)