Merge branch 'master' into iOS-Build

2015-08-23 22:35:54 +02:00
parent 907274f9bd 62d42fb61f
commit e28dd11b63
19 changed files with 10177 additions and 88 deletions
@@ -236,8 +236,8 @@ void GameStateOptions::Render()
        "Nakano, Niegen, Kaioshin, Psyringe, r1c47, Superhiro,",
        "Szei, Thanatos02, Whismer, Wololo",
        "",
-        "Thanks also go to Dr.Watson, Orine, Raphael, Sakya, Tyranid",
-        "for their help.",
+        "Thanks also go to Dr.Watson, KF1, Orine, Raphael, Sakya,",
+        "Tacoghandi, Tyranid for their help.",
        "",
        "Thanks to everyone who contributes code/content on the forums!",
        "",