scratchfoundation/scratchjr
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratchjr.git synced 2024-11-28 18:15:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #87 from thisandagain/bugfix/473

Browse source 
Finalize license and trademark information
This commit is contained in:
chrisgarrity 2016-05-18 09:21:35 -04:00
commit c2071f8168
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
LICENSE
View file

@ -1,4 +1,4 @@
Copyright (c) 2015, Massachusetts Institute of Technology
Copyright (c) 2016, Massachusetts Institute of Technology
All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

7
TRADEMARK Normal file
View file

@ -0,0 +1,7 @@
The Scratch trademarks, including the Scratch name, ScratchJr name, logo, the Scratch Cat, Gobo, Pico, Nano, Tera and Giga graphics (the "Marks"), are property of the Massachusetts Institute of Technology (MIT), and the use of the Marks is governed by this policy.
You may use the Marks to refer to Scratch and ScratchJr in Substantially Unmodified form.
"Substantially Unmodified" means the source code provided by MIT, possibly with minor modifications including but not limited to: bug fixes (including security), changing the locations of files for better integration with the host operating system, adding documentation, and changes to the dynamic linking of libraries.
A version is not "Substantially Unmodified" if it incorporates features not present in a release of Scratch by MIT. If you do make a substantial modification, to avoid confusion with versions of ScratchJr produced by MIT you must remove all Marks from your version of the software and refrain from using any of the Marks to refer to your version.

2
package.json
View file

@ -6,7 +6,7 @@
"lint": "eslint src/**",
"build": "webpack"
},
"author": "MIT Media Lab, Tufts University, Playful Invention Company",
"author": "Massachusetts Institute of Technology",
"license": "BSD-3-Clause",
"bugs": {
"url": "https://github.com/llk/scratchjr/issues"