Added logos by Spaceman and Morphed

(Commit created by redmine exporter script from page "Wiki" version 20)

diff --git a/Wiki.textile b/Wiki.textile
index 4e4e4a5f1886aab289dfd1ceeb41daf235919fe9..73e82da416981659a9ece25976c2dfca127f128e 100644 (file)
--- a/Wiki.textile
+++ b/Wiki.textile
@@ -22,7 +22,10 @@ h2. Misc
 
 h2. Art & Media 
 
-* [[Concept Art]]
+* Logo proposals
+** -z- [[Concept Art]]
+** "Spaceman":http://leela.org.uk/xonotic/index.htm
+** Morphed "1":http://img688.imageshack.us/img688/2221/xonoticlogo9.jpg "2":http://img708.imageshack.us/img708/8302/xonoticlogo8.jpg "3":http://www.morphed.planetnexuiz.com/xonotich264v3.mp4
 * How to get an animated mesh from [[Blender to DPM]]
 * We could potentially use "IQM":http://lee.fov120.com/iqm/ (needs testing!)
 * [[Player Model Spec]]