# HG changeset patch
# User Flick
# Date 1312586893 25200
# Node ID 30c9bdaad7a32ef7bb5fde5202ebb5a4a9957a68
# Parent  54d7865baae99826d7337c911c2bfb3d2c485401# Parent  7c596a5951eeb1434823e6b8dc23e9d0aa1cbec5
merge 1.1 beta 10 to stable

diff -r 54d7865baae9 -r 30c9bdaad7a3 .hgtags
--- a/.hgtags	Fri Jul 01 14:35:48 2011 -0700
+++ b/.hgtags	Fri Aug 05 16:28:13 2011 -0700
@@ -7,3 +7,4 @@
 28f91ed1560ff659d92f3dd3d3042dd818d1d198 1.1 beta 7
 499ca4edf033da3ec4fc52fd1058bf27b2679bbe 1.1 beta 8
 d913dd4878af0e4fa0380c777be74088b5a49ffc 1.1 beta 9
+276165a0e860616f13c042f93115f48a03ffc117 1.1 beta 10
diff -r 54d7865baae9 -r 30c9bdaad7a3 ActionButton.lua
--- a/ActionButton.lua	Fri Jul 01 14:35:48 2011 -0700
+++ b/ActionButton.lua	Fri Aug 05 16:28:13 2011 -0700
@@ -15,7 +15,7 @@
 local IsAutoRepeatAction = IsAutoRepeatAction
 local IsUsableAction = IsUsableAction
 local IsAttackAction = IsAttackAction
-local CooldownFrame_SetTimer = CooldownFrame_SetTimer
+-- local CooldownFrame_SetTimer = CooldownFrame_SetTimer  -- don't stash this API, look it up every time to support some mods that hook it, e.g. Cooldowns
 local GetActionCooldown = GetActionCooldown
 local GetActionTexture = GetActionTexture
 local ATTACK_BUTTON_FLASH_TIME = ATTACK_BUTTON_FLASH_TIME
diff -r 54d7865baae9 -r 30c9bdaad7a3 MultiCastButton.lua
--- a/MultiCastButton.lua	Fri Jul 01 14:35:48 2011 -0700
+++ b/MultiCastButton.lua	Fri Aug 05 16:28:13 2011 -0700
@@ -7,7 +7,6 @@
 local unpack = unpack
 local GetCVar = GetCVar
 local GameTooltip_SetDefaultAnchor = GameTooltip_SetDefaultAnchor
-local CooldownFrame_SetTimer = CooldownFrame_SetTimer
 local InCombatLockdown = InCombatLockdown
 local IsUsableSpell = IsUsableSpell
 local IsUsableAction = IsUsableAction
diff -r 54d7865baae9 -r 30c9bdaad7a3 PetActionButton.lua
--- a/PetActionButton.lua	Fri Jul 01 14:35:48 2011 -0700
+++ b/PetActionButton.lua	Fri Aug 05 16:28:13 2011 -0700
@@ -12,7 +12,7 @@
 local AutoCastShine_AutoCastStart = AutoCastShine_AutoCastStart
 local AutoCastShine_AutoCastStop = AutoCastShine_AutoCastStop
 local SetDesaturation = SetDesaturation
-local CooldownFrame_SetTimer = CooldownFrame_SetTimer
+-- local CooldownFrame_SetTimer = CooldownFrame_SetTimer  -- don't stash this API, look it up every time to support some mods that hook it, e.g. Cooldowns
 local GameTooltip_SetDefaultAnchor = GameTooltip_SetDefaultAnchor
 
 --
diff -r 54d7865baae9 -r 30c9bdaad7a3 StanceButton.lua
--- a/StanceButton.lua	Fri Jul 01 14:35:48 2011 -0700
+++ b/StanceButton.lua	Fri Aug 05 16:28:13 2011 -0700
@@ -6,7 +6,7 @@
 local format = string.format
 local GetCVar = GetCVar
 local GameTooltip_SetDefaultAnchor = GameTooltip_SetDefaultAnchor
-local CooldownFrame_SetTimer = CooldownFrame_SetTimer
+-- local CooldownFrame_SetTimer = CooldownFrame_SetTimer  -- don't stash this API, look it up every time to support some mods that hook it, e.g. Cooldowns
 local InCombatLockdown = InCombatLockdown
 local GetNumShapeshiftForms = GetNumShapeshiftForms
 local GetShapeshiftFormInfo = GetShapeshiftFormInfo