Mike Gerwitz

Activist for User Freedom

aboutsummaryrefslogtreecommitdiffstats
path: root/images
diff options
context:
space:
mode:
authorMike Gerwitz <mike@mikegerwitz.com>2013-08-18 12:47:33 -0400
committerMike Gerwitz <mike@mikegerwitz.com>2013-08-18 12:47:33 -0400
commitfcd8eeea9a336d28cfc8986cf0ed21b20a965b5e (patch)
treee9cdfbd6306d03e69cfd321940d79852cbb918ee /images
parenta79b9ccf43c76f2bacd97febf07a94a7c9218caf (diff)
downloadthoughts-fcd8eeea9a336d28cfc8986cf0ed21b20a965b5e.tar.gz
thoughts-fcd8eeea9a336d28cfc8986cf0ed21b20a965b5e.tar.bz2
thoughts-fcd8eeea9a336d28cfc8986cf0ed21b20a965b5e.zip
:Replaced now out-of-date Windows 7 Sins image with EFF NSA Spying logo
Diffstat (limited to 'images')
-rw-r--r--images/COPYING7
-rw-r--r--images/eff-nsa-spying.pngbin0 -> 111988 bytes
-rw-r--r--images/win7sins.pngbin19076 -> 0 bytes
3 files changed, 3 insertions, 4 deletions
diff --git a/images/COPYING b/images/COPYING
index e31b699..e2ad8bd 100644
--- a/images/COPYING
+++ b/images/COPYING
@@ -4,6 +4,9 @@ licensed under the Creative Commons Attribution-ShareAlike 3.0 Unported License.
Information on the Creative Commons button image may be found at
<http://creativecommons.org/policies>.
+Use of the ``NSA Spying'' image is permitted by the EFF when used to link
+to their website; see <https://www.eff.org/copyright>.
+
The ``Cross satches'' background image, authored by Andrey Ovcharov, and is
licensed under the Creative Commons Attribution-ShareAlike 3.0 Unported License
by Subtle Patterns; more information may be found at
@@ -13,10 +16,6 @@ The ``Hollyweb'' image, authored by the Free Software Foundation, is licensed
under the Creative Commons Attribution-ShareAlike 3.0 Unported License; see
<http://www.defectivebydesign.org/no-drm-in-html5>.
-The ``Windows 7 Sins'' and ``Close Windows, Open Doors'' images are authored by
-the Free Software Foundation; see <http://en.windows7sins.org/widget/> and
-<windows7sins.com> respectively.
-
The ``Heckert GNU'' head, authored by Aurelio A. Heckert, is licensed under the
Free Art License; see
<http://commons.wikimedia.org/wiki/File:Heckert_GNU_white.svg>.
diff --git a/images/eff-nsa-spying.png b/images/eff-nsa-spying.png
new file mode 100644
index 0000000..505976f
--- /dev/null
+++ b/images/eff-nsa-spying.png
Binary files differ
diff --git a/images/win7sins.png b/images/win7sins.png
deleted file mode 100644
index f6eced7..0000000
--- a/images/win7sins.png
+++ /dev/null
Binary files differ