StardewValley
/
jsoneditor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated license information on some other places too

This commit is contained in:
jos 2016-08-13 21:23:43 +02:00
parent 25dfa2c0e1
commit a12505b017
4 changed files with 5 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LICENSE
View File

@ -1,6 +1,6 @@
The MIT License (MIT)
Copyright (c) 2016 Jos de Jong
Copyright (c) 2011-2016 Jos de Jong
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

17
NOTICE
View File

@ -1,17 +0,0 @@
JSON Editor
https://github.com/josdejong/jsoneditor
Copyright (C) 2011-2015 Jos de Jong
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

5
gulpfile.js
View File

@ -128,7 +128,4 @@ gulp.task('watch', ['bundle'], function () {
});
// The default task (called when you run `gulp`)
gulp.task('default', [
'bundle',
'bundle-minimalist'
]);
gulp.task('default', [ 'bundle', 'bundle-minimalist' ]);

15
src/header.js
View File

@ -1,5 +1,6 @@
/*!
* jsoneditor.js
* https://github.com/josdejong/jsoneditor
*
* @brief
* JSONEditor is a web-based tool to view, edit, format, and validate JSON.
@ -9,19 +10,9 @@
* Supported browsers: Chrome, Firefox, Safari, Opera, Internet Explorer 8+
*
* @license
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy
* of the License at
* The MIT License (MIT)
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*
* Copyright (c) 2011-2016 Jos de Jong, http://jsoneditoronline.org
* Copyright (c) 2011-2016 Jos de Jong
*
* @author Jos de Jong, <wjosdejong@gmail.com>
* @version @@version