Merge pull request #226 from emanuele45/new_avatars

New avatars selected by Ant
SimpleMachines · Oct 25, 2012 · 75a0617 · 75a0617
2 parents 8894d4f + 84d3879
commit 75a0617
Show file tree

Hide file tree

Showing 22 changed files with 10 additions and 1 deletion.
diff --git a/Sources/Who.php b/Sources/Who.php
@@ -710,7 +710,7 @@ function Credits($in_admin = false)
 	$context['credits_software_graphics'] = array(
 		'graphics' => array(
 			'<a href="http://p.yusukekamiyamane.com/">Fugue Icons</a> | &copy; 2012 Yusuke Kamiyamane | These icons are licensed under a Creative Commons Attribution 3.0 License',
-			'<a href="http://www.oxygen-icons.org/">Oxygen Icons</a> | These icons are licensed under <a href="http://www.gnu.org/licenses/lgpl-3.0.txt">GNU LGPL 3</a>',
+			'<a href="http://www.oxygen-icons.org/">Oxygen Icons</a> | These icons are licensed under <a href="http://creativecommons.org/licenses/by-sa/3.0/">CC BY-SA 3.0</a>',
 		),
 		'software' => array(
 			'<a href="http://jquery.org/">JQuery</a> | &copy; John Resig | Licensed under <a href="http://github.com/jquery/jquery/blob/master/MIT-LICENSE.txt">The MIT License (MIT)</a>',

diff --git a/avatars/Oxygen/Earl.png b/avatars/Oxygen/Earl.png
diff --git a/avatars/Oxygen/beagle.png b/avatars/Oxygen/beagle.png
diff --git a/avatars/Oxygen/bug.png b/avatars/Oxygen/bug.png
diff --git a/avatars/Oxygen/cards.png b/avatars/Oxygen/cards.png
diff --git a/avatars/Oxygen/cookie.png b/avatars/Oxygen/cookie.png
diff --git a/avatars/Oxygen/dice.png b/avatars/Oxygen/dice.png
diff --git a/avatars/Oxygen/flish.png b/avatars/Oxygen/flish.png
diff --git a/avatars/Oxygen/game.png b/avatars/Oxygen/game.png
diff --git a/avatars/Oxygen/golf.png b/avatars/Oxygen/golf.png
diff --git a/avatars/Oxygen/hardware.png b/avatars/Oxygen/hardware.png
diff --git a/avatars/Oxygen/index.php b/avatars/Oxygen/index.php
@@ -0,0 +1,9 @@
+<?php
+
+// Try to handle it with the upper level index.php.  (it should know what to do.)
+if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
+	include (dirname(dirname(__FILE__)) . '/index.php');
+else
+	exit;
+
+?>
diff --git a/avatars/Oxygen/invisible-user.png b/avatars/Oxygen/invisible-user.png
diff --git a/avatars/Oxygen/lense.png b/avatars/Oxygen/lense.png
diff --git a/avatars/Oxygen/love.png b/avatars/Oxygen/love.png
diff --git a/avatars/Oxygen/megaphone.png b/avatars/Oxygen/megaphone.png
diff --git a/avatars/Oxygen/pi.png b/avatars/Oxygen/pi.png
diff --git a/avatars/Oxygen/scope.png b/avatars/Oxygen/scope.png
diff --git a/avatars/Oxygen/smiley.png b/avatars/Oxygen/smiley.png
diff --git a/avatars/Oxygen/tea.png b/avatars/Oxygen/tea.png
diff --git a/avatars/Oxygen/wine.png b/avatars/Oxygen/wine.png
diff --git a/avatars/Oxygen/wolf.png b/avatars/Oxygen/wolf.png