Merge branch 'master' into wrath

2008-09-02 17:03:48 +02:00
parent c7c303ae3c a44b12b76f
commit da58d8e303
9 changed files with 46 additions and 0 deletions
@@ -110,3 +110,5 @@ if not L then return end
 -- L["You can set the bar to be always hidden, if you only wish to access it using key-bindings."] = true
 -- L["You can use any macro conditionals in the custom string, using \"show\" and \"hide\" as values.\n\nExample: [combat]hide;show"] = true
 -- L["Zoom"] = true
+-- L["|cffffff00Click|r to toggle bar lock"] = true
+-- L["|cffffff00Right-click|r to open the options menu"] = true