Had some conflicts in the tree. Added a comment to locale.lua to test if said tree conflicts are fixed now.

2011-07-05 22:45:43 +00:00 · 2011-07-05 22:45:43 +00:00 · 67131c701e
Parent cbc1225158
--- a/QHData-base/locale.lua
+++ b/QHData-base/locale.lua
@ -1,3 +1,4 @@
+-- This is what loads the appropriate locale specific data.
 local loaded, reason = LoadAddon("QHData-" .. GetLocale())

 assert(loaded == 1, getglobal("ADDON_" .. reason))