Merge branch 'trunk' into svn

fofix · Aug 27, 2009 · 4dec649 · 4dec649
2 parents 2bdfa90 + 93f7ea7
commit 4dec649
Show file tree

Hide file tree

Showing 108 changed files with 30,576 additions and 15,106 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -1,9 +1,10 @@
 Current authors: please see CREDITS
+Theme authors can be found in data/themes/<theme name>/CREDITS
 
 Original FretsOnFire authors:
   Sami Ky�stil� <sami.kyostila@gmail.com>
   Joonas Kerttula <jokerttu@paju.oulu.fi>
   Tommi Inkil� <tinkila@paju.oulu.fi>
 
-For other copyrights information, please refer to doc/copyright and to the
+For other copyright information, please refer to doc/copyright and to the
 theme-specific copyrights located in data/themes/<theme name>/copyright.
diff --git a/COPYING b/COPYING
@@ -1,3 +1,6 @@
+The following applies to the FoFiX program. For details regarding
+other included elements (such as the fonts), please see doc/copyright.
+
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 

diff --git a/CREDITS b/CREDITS
@@ -40,18 +40,20 @@ Ryoma
 Richard Askren (Hollowmind necks)
 
 =%translators%=
-`%brazilian%`
-Diogo Custodio (pingflood)
 `%french%`
 Fabien Culpo (fablaculp)
 `%german%`
-TypusMensch, BlackJack, x-driver
+icke01
+`%italian%`
+Simograndi
 `%piglatin%`
 BlackJack
+`%portuguese-b%`
+Diogo Custodio (pingflood)
 `%russian%`
 Dan Konovalov (Clayman)
 `%spanish%`
-Alexfighter
+Borisdsp
 `%swedish%`
 Anton Tamminen
 
@@ -78,7 +80,8 @@ Bluto ($10.00)
 Anonymous ($8.00)
 SmashD ($7.50)
 Simon Lemaire, Ryan Turcotte, Ethd,
-BorisDSP, ForFretsSake, Tynam,
+BorisDSP, ForFretsSake, 
+Tynam, Noel Varelas, 
 and christcenteredgamer.com ($5.00)
 kirbix ($3.00)
 James Subrecky ($2.50)

diff --git a/data/default.ttf b/data/default.ttf
diff --git a/data/international.ttf b/data/international.ttf