Skip to content

Commit 42e68ab

Browse files
author
Pavel Petroshenko
authored
Merge pull request #35 from electricimp/develop
4.0.0
2 parents 34572a0 + 9db73ed commit 42e68ab

26 files changed

+494
-353
lines changed

Diff for: .gitignore

+27
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,30 @@
1+
# MIT License
2+
#
3+
# Copyright 2016-2017 Electric Imp
4+
#
5+
# SPDX-License-Identifier: MIT
6+
#
7+
# Permission is hereby granted, free of charge, to any person obtaining a copy
8+
# of this software and associated documentation files (the "Software"), to deal
9+
# in the Software without restriction, including without limitation the rights
10+
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
11+
# copies of the Software, and to permit persons to whom the Software is
12+
# furnished to do so, subject to the following conditions:
13+
#
14+
# The above copyright notice and this permission notice shall be
15+
# included in all copies or substantial portions of the Software.
16+
#
17+
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
18+
# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
19+
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO
20+
# EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES
21+
# OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
22+
# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
23+
# OTHER DEALINGS IN THE SOFTWARE.
24+
25+
# exclude Build API key file
26+
settings/auth.info
27+
128
*.nut.bundled
229
*-local
330
*.local

Diff for: .impt.test

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
"*.test.nut",
99
"tests/**/*.test.nut"
1010
],
11-
"agentFile": "promise.class.nut"
11+
"agentFile": "Promise.lib.nut"
1212
}

0 commit comments

Comments
 (0)