From: W. Trevor King Date: Fri, 17 Jan 2014 18:42:43 +0000 (-0800) Subject: media/src/binary/uss-enterprise.jpg: Add image of the USS Enterprise X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=0a791b03e908a5afa4112bd570d3dfac7fa9739d;p=reveal.js.git media/src/binary/uss-enterprise.jpg: Add image of the USS Enterprise This image is from Wikimedia commons [1]. The original image [2] is a photograph by James Teterenko [3] of the FX6-1995-A statue in Vulcan, Alberta [4]. The statue is a replica of the USS Enterprise [5] named after Vulcan Airport (FX6) [4]. James dual licensed the file under either: * The GNU Free Documentation License [6], version 1.2 or any later version published by the Free Software Foundation [7]; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. * The Create Commons Attribution-Share Alike 3.0 Unported license [8,9]. In 2010, Julo [10] used GIMP [11] to add additional sky to James' image so that the ship appears to be flying [12]. It's not flying in space (maybe a picture at night? ;), but it's close enough. Julo licensed his derivative work under the same licenses that James used for his original [12]. [1]: http://commons.wikimedia.org/wiki/File:Spaceship_airborn_right.jpg [2]: http://commons.wikimedia.org/wiki/File:VulcanAlbertaEnterpriseReplica.jpg [3]: http://commons.wikimedia.org/wiki/User:JamesTeterenko [4]: http://en.wikipedia.org/wiki/Vulcan,_Alberta [5]: http://en.wikipedia.org/wiki/Starship_Enterprise [6]: http://www.gnu.org/licenses/fdl-1.2.html [7]: https://fsf.org/ [8]: http://creativecommons.org/licenses/by-sa/3.0/deed.en [9]: http://creativecommons.org/licenses/by-sa/3.0/legalcode [10]: http://commons.wikimedia.org/wiki/User:Julo [11]: http://www.gimp.org/ [12]: http://commons.wikimedia.org/wiki/File:Spaceship_airborn_right.jpg --- diff --git a/media/src/binary/uss-enterprise.jpg b/media/src/binary/uss-enterprise.jpg new file mode 100644 index 0000000..1b475b0 Binary files /dev/null and b/media/src/binary/uss-enterprise.jpg differ