# HG changeset patch
# User Palewolf
# Date 1289159983 -3600
# Node ID eab3f01770e6f15cfeca443ab5dff1866f8b56e9
# Parent  43b22a66b778032bf86a3e6ffa66179eb16da862
Merge README and CREDITS files into CREDITS

diff -r 43b22a66b778 -r eab3f01770e6 CREDITS
--- a/CREDITS	Sun Nov 07 14:54:30 2010 -0500
+++ b/CREDITS	Sun Nov 07 20:59:43 2010 +0100
@@ -1,26 +1,51 @@
-Community submited content
+EXTENDED CREDITS LIST
+
+==========
+= FONTS
+==========
+- see Fonts_LICENSE.txt
 
 ==========
 = HATS
 ==========
-- Robinator -> Terminator
-- shingo666 -> Samus
-- MeinCookie95 -> InfernalHorns
-- MeinCookie95 -> Mummy
-- thuban -> Elvis
-- Miphica -> Disguise
-- Blayde -> Deer, Moose
-- hillis -> AkuAku
-- Lortinak -> OldMan, ShortHair
-- chujoii -> BrainSlug, Dragon, Ladle, Laminaria, Pantsu, Pig, Plunger, SauceBoat, ShaggyYeti, SleepWalker, SunWukong, Teapot, Teacup, Zombi
+- Robinator -> Terminator (2010)
+- shingo666 -> Samus (2010)
+- MeinCookie95 -> InfernalHorns (2010)
+- MeinCookie95 -> Mummy (2010)
+- thuban -> Elvis (2010)
+- Miphica -> Disguise (2010)
+- Blayde -> Deer (2010), Moose (2010)
+- hillis -> AkuAku (2010)
+- Lortinak -> OldMan (2010), ShortHair (2010)
+- chujoii -> BrainSlug (2010), Dragon (2010), Ladle (2010), Laminaria (2010), Pantsu (2010), Pig (2010), Plunger (2010), SauceBoat (2010), ShaggyYeti (2010), SleepWalker (2010), SunWukong (2010), Teapot (2010), Teacup (2010), Zombi (2010)
 
 ==========
 = MAPS
 ==========
-- dctPL -> Sticks
-- wolfmark & Dragonfly -> TrophyRace, ShoppaKing
+- John Dum <fizzy@gmail.com> -> Bath (2008), Hedgelove (2008), Hedgewars (2008), Hydrant (2008), mushrooms (2008), Plane (2008)
+- Joshua Frese <joshfrese@gmail.com> -> Bamboo (2008), EarthRise (2008), Freeway (2008), BambooPlinko (2008)
+- Stanko Tadić <stanko@mfhinc.net> -> Castle (2008), PirateFlag (2008)
+- dctPL -> Sticks (2010)
+- wolfmark & Dragonfly -> TrophyRace (2010), ShoppaKing (2010)
+
+==========
+= MUSIC
+==========
+- John Dum <fizzy@gmail.com> -> Nature theme
+- Jonatan Nilsson <jonatanfan@gmail.com> -> Pirate theme, City theme, Oriental theme, Snow theme
 
 ==========
 = THEMES
 ==========
-- KoRn666 - Jungle
\ No newline at end of file
+- John Dum <fizzy@gmail.com> -> Nature (2008), Snow (2008), City
+- Joshua Frese <joshfrese@gmail.com> -> Bamboo (2008), EarthRise (2008), Freeway (2008), BambooPlinko (2008)
+- Stanko Tadić <stanko@mfhinc.net> -> Hell (2008)
+- Julien Koesten <julienkoesten@aol.com> -> Sheep (2008)
+- KoRn666 - Jungle (2010)
+
+==========
+= VOICES
+==========
+- Stephen Alexander <ArmagonNo1@gmail.com>
+
+ALL OTHER CONTENT IS PROPERTY OF Andrey Korotaev <unC0Rr@gmail.com> UNLESS OTHERWISE SPECIFIED
\ No newline at end of file
diff -r 43b22a66b778 -r eab3f01770e6 README
--- a/README	Sun Nov 07 14:54:30 2010 -0500
+++ b/README	Sun Nov 07 20:59:43 2010 +0100
@@ -4,34 +4,4 @@
 
 Source:
 Copyright 2004-2009 Andrey Korotaev <unC0Rr@gmail.com>
-Copyright 2006-2008 Igor Ulyanov aka Displacer <iulyanov@gmail.com>
-
-Sounds in Data/Sounds/Voices
-Copyright 2008, 2009 Stephen Alexander <ArmagonNo1@gmail.com>
-
-'Nature' music theme:
-Copyright 2008 John Dum <fizzy@gmail.com>
-
-'Pirate', 'City', 'Oriental', 'Snow' music themes:
-Copyright 2008 Jonatan Nilsson <jonatanfan@gmail.com>
-
-Images in Data/Graphics,
-themes "nature", "Snow", "City",
-maps "Bath", "Hedgelove", "Hedgewars", "Hydrant", "mushrooms", "Plane"
-Copyright 2008 John Dum <fizzy@gmail.com>
-
-Fonts: see Fonts_LICENSE.txt
-
-Map and theme "cheese":
-based on Wormux map "cheese" by Anthony Carré <yeknan AT yahoo DOT fr>
-
-Maps and themes "Bamboo", "EarthRise", "Freeway",
-map "BambooPlinko":
-Copyright 2008 Joshua Frese <joshfrese@gmail.com>
-
-Maps "Castle", "PirateFlag"
-theme "hell":
-Copyright 2008 Stanko Tadić <stanko@mfhinc.net>
-
-Theme "Sheep"
-Copyright 2008 Julien Koesten <julienkoesten@aol.com>
+Copyright 2006-2008 Igor Ulyanov aka Displacer <iulyanov@gmail.com>
\ No newline at end of file