Skip to content

Commit 78bd744

Browse files
committed
Merge branch 'master' of github.com:oseiskar/black-hole
2 parents 17729fa + 2f00b5a commit 78bd744

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

COPYRIGHT.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
- [three.js](https://threejs.org) + components `Detector.js`, `OrbitControls.js` and the moon texture `img/moon_1024.jpg`
66
- [stats.js](https://github.com/mrdoob/stats.js)
77
- [mustache.js](https://github.com/janl/mustache.js)
8-
- [ShaderLoader.js](https://github.com/codecruzer/webgl-shader-loader-js))
9-
-
8+
- [ShaderLoader.js](https://github.com/codecruzer/webgl-shader-loader-js)
109
* The Milky Way image `img/milkyway.jpg` is from http://www.stellarium.org/wiki/index.php/Textures and "based on Nick Risinger's [Photopic Sky Survey](http://skysurvey.org/) image under [CC-BY-NC. Details](http://creativecommons.org/licenses/by-nc/2.0/)."
1110
* `index.html` also adapted from three.js
1211
* Other material (C) Otto Seiskari, 2015

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
### Ray-traced simulation of a black hole using
1+
### Ray-traced simulation of a black hole
22

33
_see **[COPYRIGHT.md](https://github.com/oseiskar/black-hole/blob/master/COPYRIGHT.md)** for license and copyright info_
44

0 commit comments

Comments
 (0)