Skip to content

Commit bdc537e

Browse files
author
Jason Kridner
committed
Merge branch 'simplified-app'
Conflicts: README.htm
2 parents 10aef41 + 7b98f24 commit bdc537e

File tree

32 files changed

+33554
-0
lines changed

32 files changed

+33554
-0
lines changed

app/LICENSE

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
Copyright (c) 2012 Intel Corp
2+
Copyright (c) 2012 The Chromium Authors
3+
4+
Permission is hereby granted, free of charge, to any person obtaining a copy of
5+
this software and associated documentation files (the "Software"), to deal in th
6+
e Software without restriction, including without limitation the rights to use,
7+
copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
8+
Software, and to permit persons to whom the Software is furnished to do so, subj
9+
ect to the following conditions:
10+
11+
The above copyright notice and this permission notice shall be included in all c
12+
opies or substantial portions of the Software.
13+
14+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
15+
ED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR
16+
A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYR
17+
IGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
18+
ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WIT
19+
H THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

app/README

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
node-webkit comes from https://github.com/rogerwang/node-webkit/commit/20eec65cb7788c9e969d5ad8e41f03b8ad66b9ea
2+
For build scripts, see https://github.com/jadonk/beaglebone-gettig-started/tree/webkit-build-scripts

0 commit comments

Comments
 (0)