Skip to content

Commit 86944d5

Browse files
authored
Merge pull request #404 from aaronfranke/readme-license
Update README and LICENSE for Godot 3.2
2 parents 177884f + 827d67b commit 86944d5

File tree

2 files changed

+22
-26
lines changed

2 files changed

+22
-26
lines changed

LICENSE.md

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,21 @@
1-
GODOT ENGINE
2-
http://www.godotengine.org
1+
Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.
2+
Copyright (c) 2014-2020 Godot Engine contributors.
33

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

6-
Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur.
12+
The above copyright notice and this permission notice shall be
13+
included in all copies or substantial portions of the Software.
714

8-
Permission is hereby granted, free of charge, to any person obtaining
9-
a copy of this software and associated documentation files (the
10-
"Software"), to deal in the Software without restriction, including
11-
without limitation the rights to use, copy, modify, merge, publish,
12-
distribute, sublicense, and/or sell copies of the Software, and to
13-
permit persons to whom the Software is furnished to do so, subject to
14-
the following conditions:
15-
16-
The above copyright notice and this permission notice shall be
17-
included in all copies or substantial portions of the Software.
18-
19-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
20-
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
21-
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
22-
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
23-
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
24-
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
25-
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
26-
27-
************************************************************************
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
16+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
17+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
18+
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
19+
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
20+
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
21+
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@ Each folder containing a `project.godot` file is a demo project meant to
44
be used with [Godot Engine](https://godotengine.org), the open source
55
2D and 3D game engine.
66

7-
## Important note
7+
## Godot versions
88

9-
- The `master` branch is compatible with the latest stable Godot version (currently 3.1).
9+
- The [`master`](https://github.com/godotengine/godot-demo-projects) branch is compatible with the latest stable Godot version (currently 3.2).
1010
- If you are using an older version of Godot, use the appropriate branch for your Godot version:
1111

12+
- [`3.1`](https://github.com/godotengine/godot-demo-projects/tree/3.1) branch
13+
for Godot 3.1.x.
1214
- [`3.0`](https://github.com/godotengine/godot-demo-projects/tree/3.0) branch
1315
for Godot 3.0.x.
1416
- [`2.1`](https://github.com/godotengine/godot-demo-projects/tree/2.1) branch

0 commit comments

Comments
 (0)