*Merge.

--HG-- branch : trunk
2009-02-18 11:36:19 -06:00
parent 017f309b5b 7bff1c1d60
commit 31637d4aac
2384 changed files with 9729 additions and 969 deletions
@@ -76,3 +76,4 @@ struct NpcTextLocale
    std::vector<std::vector<std::string> > Text_1;
 };
 #endif
+