*Merge.

--HG-- branch : trunk
2009-04-15 17:06:38 -05:00
parent 8e910aca6b 348339770e
commit 905833f84e
17 changed files with 266 additions and 43 deletions
@@ -694,7 +694,9 @@ enum TrinityStrings
 //  LANG_BG_EY_START_TWO_MINUTES        = 755, - defined above
    // Room for batleground/arena strings 756-799 not used

-    // Room for BG/ARENA                  750-769 not used
+    // Room for BG/ARENA                  751-769 not used
+    
+    LANG_NPCINFO_LINKGUID               = 750,

    LANG_ARENA_TESTING                  = 785,
    LANG_AUTO_ANN                       = 786,