diff --git a/Titan/Titan_Mainline.toc b/Titan/Titan_Mainline.toc index 6ec8f2d..8d502b1 100644 --- a/Titan/Titan_Mainline.toc +++ b/Titan/Titan_Mainline.toc @@ -1,7 +1,11 @@ +<<<<<<< HEAD ## Interface: 100206 ## Title: Titan Panel [|cffeda55f_Core_|r] |cff00aa008.0.7|r +======= +## Interface: 100205 +## Title: Titan Panel [|cffeda55f_Core_|r] |cff00aa008.0.8|r +>>>>>>> origin/master ## Author: Titan Panel Dev Team -## Version: 8.0.7 ## IconTexture: Interface\Icons\Achievement_Dungeon_UlduarRaid_Titan_01 ## SavedVariables: TitanAll, TitanSettings, TitanSkins, ServerTimeOffsets, ServerHourFormat ## Notes: Adds display bars to show and control information/launcher plugins. diff --git a/TitanAmmo/TitanAmmo_Vanilla.toc b/TitanAmmo/TitanAmmo_Vanilla.toc index 5181485..fd491a3 100644 --- a/TitanAmmo/TitanAmmo_Vanilla.toc +++ b/TitanAmmo/TitanAmmo_Vanilla.toc @@ -1,6 +1,12 @@ +<<<<<<< HEAD ## Interface: 11501 ## Title: Titan Panel [|cffeda55fAmmo|r] |cff00aa008.0.7|r ## Version: 8.0.7 +======= +## Interface: 11500 +## Title: Titan Panel [|cffeda55fAmmo|r] |cff00aa008.0.8|r +## Version: 8.0.8 +>>>>>>> origin/master ## Notes: Adds an ammo monitor to Titan Panel - Classic versions only ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: diff --git a/TitanAmmo/TitanAmmo_Wrath.toc b/TitanAmmo/TitanAmmo_Wrath.toc index 92c6dcb..22389af 100644 --- a/TitanAmmo/TitanAmmo_Wrath.toc +++ b/TitanAmmo/TitanAmmo_Wrath.toc @@ -1,6 +1,6 @@ ## Interface: 30403 -## Title: Titan Panel [|cffeda55fAmmo|r] |cff00aa008.0.7|r -## Version: 8.0.7 +## Title: Titan Panel [|cffeda55fAmmo|r] |cff00aa008.0.8|r +## Version: 8.0.8 ## Notes: Adds an ammo monitor to Titan Panel - Classic versions only ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: diff --git a/TitanBag/TitanBag_Mainline.toc b/TitanBag/TitanBag_Mainline.toc index c227bbf..1007000 100644 --- a/TitanBag/TitanBag_Mainline.toc +++ b/TitanBag/TitanBag_Mainline.toc @@ -1,6 +1,12 @@ +<<<<<<< HEAD ## Interface: 100206 ## Title: Titan Panel [|cffeda55fBag|r] |cff00aa008.0.7|r ## Version: 8.0.7 +======= +## Interface: 100205 +## Title: Titan Panel [|cffeda55fBag|r] |cff00aa008.0.8|r +## Version: 8.0.8 +>>>>>>> origin/master ## IconTexture: Interface\AddOns\TitanBag\TitanBag ## Notes: Adds bag and free slot information to Titan Panel ## Author: Titan Panel Development Team (http://www.titanpanel.org) diff --git a/TitanBag/TitanBag_Vanilla.toc b/TitanBag/TitanBag_Vanilla.toc index 0d60a52..e4028ce 100644 --- a/TitanBag/TitanBag_Vanilla.toc +++ b/TitanBag/TitanBag_Vanilla.toc @@ -1,6 +1,12 @@ +<<<<<<< HEAD ## Interface: 11501 ## Title: Titan Panel [|cffeda55fBag|r] |cff00aa008.0.7|r ## Version: 8.0.7 +======= +## Interface: 11500 +## Title: Titan Panel [|cffeda55fBag|r] |cff00aa008.0.8|r +## Version: 8.0.8 +>>>>>>> origin/master ## Notes: Adds bag and free slot information to Titan Panel ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: diff --git a/TitanBag/TitanBag_Wrath.toc b/TitanBag/TitanBag_Wrath.toc index f2ebf5c..fa2dc9e 100644 --- a/TitanBag/TitanBag_Wrath.toc +++ b/TitanBag/TitanBag_Wrath.toc @@ -1,6 +1,6 @@ ## Interface: 30403 -## Title: Titan Panel [|cffeda55fBag|r] |cff00aa008.0.7|r -## Version: 8.0.7 +## Title: Titan Panel [|cffeda55fBag|r] |cff00aa008.0.8|r +## Version: 8.0.8 ## Notes: Adds bag and free slot information to Titan Panel ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: diff --git a/TitanClassic/TitanClassic_Vanilla.toc b/TitanClassic/TitanClassic_Vanilla.toc index 0b1e7fb..3f5a495 100644 --- a/TitanClassic/TitanClassic_Vanilla.toc +++ b/TitanClassic/TitanClassic_Vanilla.toc @@ -1,7 +1,12 @@ +<<<<<<< HEAD ## Interface: 11501 ## Title: Titan Panel [|cffeda55f_Core_|r] |cff00aa008.0.7|r +======= +## Interface: 11500 +## Title: Titan Panel [|cffeda55f_Core_|r] |cff00aa008.0.8|r +>>>>>>> origin/master ## Author: Titan Panel Dev Team -## Version: 8.0.7 +## Version: 8.0.8 ## SavedVariables: TitanAll, TitanSettings, TitanSkins, ServerTimeOffsets, ServerHourFormat ## OptionalDeps: Ace3, AceGUI-3.0-SharedMediaWidgets, LibSharedMedia-3.0, LibQTip-1.0, !LibUIDropDownMenu ## Notes: Adds display bars to show and control information/launcher plugins. diff --git a/TitanClassic/TitanClassic_Wrath.toc b/TitanClassic/TitanClassic_Wrath.toc index 177f5ca..4a81031 100644 --- a/TitanClassic/TitanClassic_Wrath.toc +++ b/TitanClassic/TitanClassic_Wrath.toc @@ -1,7 +1,7 @@ ## Interface: 30403 -## Title: Titan Panel [|cffeda55f_Core_|r] |cff00aa008.0.7|r +## Title: Titan Panel [|cffeda55f_Core_|r] |cff00aa008.0.8|r ## Author: Titan Panel Dev Team -## Version: 8.0.7 +## Version: 8.0.8 ## SavedVariables: TitanAll, TitanSettings, TitanSkins, ServerTimeOffsets, ServerHourFormat ## OptionalDeps: Ace3, AceGUI-3.0-SharedMediaWidgets, LibSharedMedia-3.0, LibQTip-1.0, !LibUIDropDownMenu ## Notes: Adds display bars to show and control information/launcher plugins. diff --git a/TitanClock/TitanClock_Mainline.toc b/TitanClock/TitanClock_Mainline.toc index 9b7625e..5d96891 100644 --- a/TitanClock/TitanClock_Mainline.toc +++ b/TitanClock/TitanClock_Mainline.toc @@ -1,6 +1,12 @@ +<<<<<<< HEAD ## Interface: 100206 ## Title: Titan Panel [|cffeda55fClock|r] |cff00aa008.0.7|r ## Version: 8.0.7 +======= +## Interface: 100205 +## Title: Titan Panel [|cffeda55fClock|r] |cff00aa008.0.8|r +## Version: 8.0.8 +>>>>>>> origin/master ## IconTexture: Interface\Icons\Spell_Nature_TimeStop ## Notes: Adds a clock to Titan Panel ## Author: Titan Panel Development Team (http://www.titanpanel.org) diff --git a/TitanClock/TitanClock_Vanilla.toc b/TitanClock/TitanClock_Vanilla.toc index a0da425..44cdf94 100644 --- a/TitanClock/TitanClock_Vanilla.toc +++ b/TitanClock/TitanClock_Vanilla.toc @@ -1,6 +1,12 @@ +<<<<<<< HEAD ## Interface: 11501 ## Title: Titan Panel [|cffeda55fClock|r] |cff00aa008.0.7|r ## Version: 8.0.7 +======= +## Interface: 11500 +## Title: Titan Panel [|cffeda55fClock|r] |cff00aa008.0.8|r +## Version: 8.0.8 +>>>>>>> origin/master ## Notes: Adds a clock to Titan Panel ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: diff --git a/TitanClock/TitanClock_Wrath.toc b/TitanClock/TitanClock_Wrath.toc index 79e32fa..1352fdc 100644 --- a/TitanClock/TitanClock_Wrath.toc +++ b/TitanClock/TitanClock_Wrath.toc @@ -1,6 +1,6 @@ ## Interface: 30403 -## Title: Titan Panel [|cffeda55fClock|r] |cff00aa008.0.7|r -## Version: 8.0.7 +## Title: Titan Panel [|cffeda55fClock|r] |cff00aa008.0.8|r +## Version: 8.0.8 ## Notes: Adds a clock to Titan Panel ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: diff --git a/TitanGold/TitanGold_Mainline.toc b/TitanGold/TitanGold_Mainline.toc index 6c3ad73..df02ed0 100644 --- a/TitanGold/TitanGold_Mainline.toc +++ b/TitanGold/TitanGold_Mainline.toc @@ -1,6 +1,12 @@ +<<<<<<< HEAD ## Interface: 100206 ## Title: Titan Panel [|cffeda55fGold|r] |cff00aa008.0.7|r ## Version: 8.0.7 +======= +## Interface: 100205 +## Title: Titan Panel [|cffeda55fGold|r] |cff00aa008.0.8|r +## Version: 8.0.8 +>>>>>>> origin/master ## IconTexture: Interface\AddOns\TitanGold\Artwork\TitanGold ## Notes: Keeps track of all gold held by a player's toons on a per server/faction basis. ## Author: Titan Panel Development Team (http://www.titanpanel.org) diff --git a/TitanGold/TitanGold_Vanilla.toc b/TitanGold/TitanGold_Vanilla.toc index 9900dcb..c0788b6 100644 --- a/TitanGold/TitanGold_Vanilla.toc +++ b/TitanGold/TitanGold_Vanilla.toc @@ -1,6 +1,12 @@ +<<<<<<< HEAD ## Interface: 11501 ## Title: Titan Panel [|cffeda55fGold|r] |cff00aa008.0.7|r ## Version: 8.0.7 +======= +## Interface: 11500 +## Title: Titan Panel [|cffeda55fGold|r] |cff00aa008.0.8|r +## Version: 8.0.8 +>>>>>>> origin/master ## Notes: Keeps track of all gold held by a player's toons on a per server/faction basis. ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: GoldSave diff --git a/TitanGold/TitanGold_Wrath.toc b/TitanGold/TitanGold_Wrath.toc index 733c9d6..ff21e57 100644 --- a/TitanGold/TitanGold_Wrath.toc +++ b/TitanGold/TitanGold_Wrath.toc @@ -1,6 +1,6 @@ ## Interface: 30403 -## Title: Titan Panel [|cffeda55fGold|r] |cff00aa008.0.7|r -## Version: 8.0.7 +## Title: Titan Panel [|cffeda55fGold|r] |cff00aa008.0.8|r +## Version: 8.0.8 ## Notes: Keeps track of all gold held by a player's toons on a per server/faction basis. ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: GoldSave diff --git a/TitanLocation/TitanLocation_Mainline.toc b/TitanLocation/TitanLocation_Mainline.toc index f9332d1..1c0c31c 100644 --- a/TitanLocation/TitanLocation_Mainline.toc +++ b/TitanLocation/TitanLocation_Mainline.toc @@ -1,6 +1,12 @@ +<<<<<<< HEAD ## Interface: 100206 ## Title: Titan Panel [|cffeda55fLocation|r] |cff00aa008.0.7|r ## Version: 8.0.7 +======= +## Interface: 100205 +## Title: Titan Panel [|cffeda55fLocation|r] |cff00aa008.0.8|r +## Version: 8.0.8 +>>>>>>> origin/master ## IconTexture: Interface\AddOns\TitanLocation\TitanLocation ## Notes: Adds coordinates and location information to Titan Panel ## Author: Titan Panel Development Team (http://www.titanpanel.org) diff --git a/TitanLocation/TitanLocation_Vanilla.toc b/TitanLocation/TitanLocation_Vanilla.toc index 6ae6755..c56f6f3 100644 --- a/TitanLocation/TitanLocation_Vanilla.toc +++ b/TitanLocation/TitanLocation_Vanilla.toc @@ -1,6 +1,12 @@ +<<<<<<< HEAD ## Interface: 11501 ## Title: Titan Panel [|cffeda55fLocation|r] |cff00aa008.0.7|r ## Version: 8.0.7 +======= +## Interface: 11500 +## Title: Titan Panel [|cffeda55fLocation|r] |cff00aa008.0.8|r +## Version: 8.0.8 +>>>>>>> origin/master ## Notes: Adds coordinates and location information to Titan Panel ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: diff --git a/TitanLocation/TitanLocation_Wrath.toc b/TitanLocation/TitanLocation_Wrath.toc index c730e56..fb5cd39 100644 --- a/TitanLocation/TitanLocation_Wrath.toc +++ b/TitanLocation/TitanLocation_Wrath.toc @@ -1,6 +1,6 @@ ## Interface: 30403 -## Title: Titan Panel [|cffeda55fLocation|r] |cff00aa008.0.7|r -## Version: 8.0.7 +## Title: Titan Panel [|cffeda55fLocation|r] |cff00aa008.0.8|r +## Version: 8.0.8 ## Notes: Adds coordinates and location information to Titan Panel ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: diff --git a/TitanLootType/TitanLootType_Mainline.toc b/TitanLootType/TitanLootType_Mainline.toc index 4e056ea..c2286d4 100644 --- a/TitanLootType/TitanLootType_Mainline.toc +++ b/TitanLootType/TitanLootType_Mainline.toc @@ -1,6 +1,12 @@ +<<<<<<< HEAD ## Interface: 100206 ## Title: Titan Panel [|cffeda55fLootType|r] |cff00aa008.0.7|r ## Version: 8.0.7 +======= +## Interface: 100205 +## Title: Titan Panel [|cffeda55fLootType|r] |cff00aa008.0.8|r +## Version: 8.0.8 +>>>>>>> origin/master ## IconTexture: Interface\AddOns\TitanLootType\TitanLootType ## Notes: Adds group loot and instance difficulty information to Titan Panel ## Author: Titan Panel Development Team (http://www.titanpanel.org) diff --git a/TitanLootType/TitanLootType_Vanilla.toc b/TitanLootType/TitanLootType_Vanilla.toc index d2c1c20..e88e589 100644 --- a/TitanLootType/TitanLootType_Vanilla.toc +++ b/TitanLootType/TitanLootType_Vanilla.toc @@ -1,6 +1,12 @@ +<<<<<<< HEAD ## Interface: 11501 ## Title: Titan Panel [|cffeda55fLootType|r] |cff00aa008.0.7|r ## Version: 8.0.7 +======= +## Interface: 11500 +## Title: Titan Panel [|cffeda55fLootType|r] |cff00aa008.0.8|r +## Version: 8.0.8 +>>>>>>> origin/master ## Notes: Adds group loot and instance difficulty information to Titan Panel ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: TitanClassicLootTypeSaved diff --git a/TitanLootType/TitanLootType_Wrath.toc b/TitanLootType/TitanLootType_Wrath.toc index e280265..6322450 100644 --- a/TitanLootType/TitanLootType_Wrath.toc +++ b/TitanLootType/TitanLootType_Wrath.toc @@ -1,6 +1,6 @@ ## Interface: 30403 -## Title: Titan Panel [|cffeda55fLootType|r] |cff00aa008.0.7|r -## Version: 8.0.7 +## Title: Titan Panel [|cffeda55fLootType|r] |cff00aa008.0.8|r +## Version: 8.0.8 ## Notes: Adds group loot and instance difficulty information to Titan Panel ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: TitanClassicLootTypeSaved diff --git a/TitanPerformance/TitanPerformance_Mainline.toc b/TitanPerformance/TitanPerformance_Mainline.toc index 13438ad..476862e 100644 --- a/TitanPerformance/TitanPerformance_Mainline.toc +++ b/TitanPerformance/TitanPerformance_Mainline.toc @@ -1,6 +1,12 @@ +<<<<<<< HEAD ## Interface: 100206 ## Title: Titan Panel [|cffeda55fPerformance|r] |cff00aa008.0.7|r ## Version: 8.0.7 +======= +## Interface: 100205 +## Title: Titan Panel [|cffeda55fPerformance|r] |cff00aa008.0.8|r +## Version: 8.0.8 +>>>>>>> origin/master ## IconTexture: Interface\AddOns\TitanPerformance\TitanPerformance ## Notes: Adds FPS and Garbage collection information to Titan Panel ## Author: Titan Panel Development Team (http://www.titanpanel.org) diff --git a/TitanPerformance/TitanPerformance_Vanilla.toc b/TitanPerformance/TitanPerformance_Vanilla.toc index 8a0eb48..f81836f 100644 --- a/TitanPerformance/TitanPerformance_Vanilla.toc +++ b/TitanPerformance/TitanPerformance_Vanilla.toc @@ -1,6 +1,12 @@ +<<<<<<< HEAD ## Interface: 11501 ## Title: Titan Panel [|cffeda55fPerformance|r] |cff00aa008.0.7|r ## Version: 8.0.7 +======= +## Interface: 11500 +## Title: Titan Panel [|cffeda55fPerformance|r] |cff00aa008.0.8|r +## Version: 8.0.8 +>>>>>>> origin/master ## Notes: Adds FPS and Garbage collection information to Titan Panel ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: diff --git a/TitanPerformance/TitanPerformance_Wrath.toc b/TitanPerformance/TitanPerformance_Wrath.toc index 82030f5..ba784b1 100644 --- a/TitanPerformance/TitanPerformance_Wrath.toc +++ b/TitanPerformance/TitanPerformance_Wrath.toc @@ -1,6 +1,6 @@ ## Interface: 30403 -## Title: Titan Panel [|cffeda55fPerformance|r] |cff00aa008.0.7|r -## Version: 8.0.7 +## Title: Titan Panel [|cffeda55fPerformance|r] |cff00aa008.0.8|r +## Version: 8.0.8 ## Notes: Adds FPS and Garbage collection information to Titan Panel ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: diff --git a/TitanRegen/TitanRegen_Vanilla.toc b/TitanRegen/TitanRegen_Vanilla.toc index 0ecc844..9e0564f 100644 --- a/TitanRegen/TitanRegen_Vanilla.toc +++ b/TitanRegen/TitanRegen_Vanilla.toc @@ -1,6 +1,12 @@ +<<<<<<< HEAD ## Interface: 11501 ## Title: Titan Panel [|cffeda55fRegen|r] |cff00aa008.0.7|r ## Version: 8.0.7 +======= +## Interface: 11500 +## Title: Titan Panel [|cffeda55fRegen|r] |cff00aa008.0.8|r +## Version: 8.0.8 +>>>>>>> origin/master ## Notes: Adds a regen monitor to Titan Panel to show HP/MANA regen - Classic versions only ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: diff --git a/TitanRegen/TitanRegen_Wrath.toc b/TitanRegen/TitanRegen_Wrath.toc index d96105b..eee3707 100644 --- a/TitanRegen/TitanRegen_Wrath.toc +++ b/TitanRegen/TitanRegen_Wrath.toc @@ -1,6 +1,6 @@ ## Interface: 30403 -## Title: Titan Panel [|cffeda55fRegen|r] |cff00aa008.0.7|r -## Version: 8.0.7 +## Title: Titan Panel [|cffeda55fRegen|r] |cff00aa008.0.8|r +## Version: 8.0.8 ## Notes: Adds a regen monitor to Titan Panel to show HP/MANA regen - Classic versions only ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: diff --git a/TitanRepair/TitanRepair_Mainline.toc b/TitanRepair/TitanRepair_Mainline.toc index 71e9c59..79bc51c 100644 --- a/TitanRepair/TitanRepair_Mainline.toc +++ b/TitanRepair/TitanRepair_Mainline.toc @@ -1,6 +1,12 @@ +<<<<<<< HEAD ## Interface: 100206 ## Title: Titan Panel [|cffeda55fRepair|r] |cff00aa008.0.7|r ## Version: 8.0.7 +======= +## Interface: 100205 +## Title: Titan Panel [|cffeda55fRepair|r] |cff00aa008.0.8|r +## Version: 8.0.8 +>>>>>>> origin/master ## IconTexture: Interface\AddOns\TitanRepair\TitanRepair ## Notes: Provides a configurable durability display. Also adds the ability to auto repair items and inventory at vendors. Adds selling of grey items. ## Author: Titan Panel Development Team (http://www.titanpanel.org) diff --git a/TitanRepair/TitanRepair_Vanilla.toc b/TitanRepair/TitanRepair_Vanilla.toc index 11ef8cc..eddbf40 100644 --- a/TitanRepair/TitanRepair_Vanilla.toc +++ b/TitanRepair/TitanRepair_Vanilla.toc @@ -1,6 +1,12 @@ +<<<<<<< HEAD ## Interface: 11501 ## Title: Titan Panel [|cffeda55fRepair|r] |cff00aa008.0.7|r ## Version: 8.0.7 +======= +## Interface: 11500 +## Title: Titan Panel [|cffeda55fRepair|r] |cff00aa008.0.8|r +## Version: 8.0.8 +>>>>>>> origin/master ## Notes: Provides a configurable durability display. Also adds the ability to auto repair items and inventory at vendors. Adds selling of grey items. ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: diff --git a/TitanRepair/TitanRepair_Wrath.toc b/TitanRepair/TitanRepair_Wrath.toc index 15927a3..4ee362b 100644 --- a/TitanRepair/TitanRepair_Wrath.toc +++ b/TitanRepair/TitanRepair_Wrath.toc @@ -1,6 +1,6 @@ ## Interface: 30403 -## Title: Titan Panel [|cffeda55fRepair|r] |cff00aa008.0.7|r -## Version: 8.0.7 +## Title: Titan Panel [|cffeda55fRepair|r] |cff00aa008.0.8|r +## Version: 8.0.8 ## Notes: Provides a configurable durability display. Also adds the ability to auto repair items and inventory at vendors. Adds selling of grey items. ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: diff --git a/TitanVolume/TitanVolume_Mainline.toc b/TitanVolume/TitanVolume_Mainline.toc index c156d12..51f8a96 100644 --- a/TitanVolume/TitanVolume_Mainline.toc +++ b/TitanVolume/TitanVolume_Mainline.toc @@ -1,6 +1,12 @@ +<<<<<<< HEAD ## Interface: 100206 ## Title: Titan Panel [|cffeda55fVolume|r] |cff00aa008.0.7|r ## Version: 8.0.7 +======= +## Interface: 100205 +## Title: Titan Panel [|cffeda55fVolume|r] |cff00aa008.0.8|r +## Version: 8.0.8 +>>>>>>> origin/master ## IconTexture: Interface\AddOns\TitanVolume\Artwork\TitanVolumeHigh ## Notes: Adds a volume control icon on your Titan Bar ## Author: Titan Panel Development Team (http://www.titanpanel.org) diff --git a/TitanVolume/TitanVolume_Vanilla.toc b/TitanVolume/TitanVolume_Vanilla.toc index 15e8d17..aab7ea4 100644 --- a/TitanVolume/TitanVolume_Vanilla.toc +++ b/TitanVolume/TitanVolume_Vanilla.toc @@ -1,6 +1,12 @@ +<<<<<<< HEAD ## Interface: 11501 ## Title: Titan Panel [|cffeda55fVolume|r] |cff00aa008.0.7|r ## Version: 8.0.7 +======= +## Interface: 11500 +## Title: Titan Panel [|cffeda55fVolume|r] |cff00aa008.0.8|r +## Version: 8.0.8 +>>>>>>> origin/master ## Notes: Adds a volume control icon on your Titan Bar ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: diff --git a/TitanVolume/TitanVolume_Wrath.toc b/TitanVolume/TitanVolume_Wrath.toc index 1df3b3e..2d95a20 100644 --- a/TitanVolume/TitanVolume_Wrath.toc +++ b/TitanVolume/TitanVolume_Wrath.toc @@ -1,6 +1,6 @@ ## Interface: 30403 -## Title: Titan Panel [|cffeda55fVolume|r] |cff00aa008.0.7|r -## Version: 8.0.7 +## Title: Titan Panel [|cffeda55fVolume|r] |cff00aa008.0.8|r +## Version: 8.0.8 ## Notes: Adds a volume control icon on your Titan Bar ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: diff --git a/TitanXP/TitanXP_Mainline.toc b/TitanXP/TitanXP_Mainline.toc index 176ed09..b4f208f 100644 --- a/TitanXP/TitanXP_Mainline.toc +++ b/TitanXP/TitanXP_Mainline.toc @@ -1,6 +1,12 @@ +<<<<<<< HEAD ## Interface: 100206 ## Title: Titan Panel [|cffeda55fXP|r] |cff00aa008.0.7|r ## Version: 8.0.7 +======= +## Interface: 100205 +## Title: Titan Panel [|cffeda55fXP|r] |cff00aa008.0.8|r +## Version: 8.0.8 +>>>>>>> origin/master ## IconTexture: Interface\Icons\xp_icon ## Notes: Adds information to Titan Panel about XP earned and time to level ## Author: Titan Panel Development Team (http://www.titanpanel.org) diff --git a/TitanXP/TitanXP_Vanilla.toc b/TitanXP/TitanXP_Vanilla.toc index ab67d6a..89f25d4 100644 --- a/TitanXP/TitanXP_Vanilla.toc +++ b/TitanXP/TitanXP_Vanilla.toc @@ -1,6 +1,12 @@ +<<<<<<< HEAD ## Interface: 11501 ## Title: Titan Panel [|cffeda55fXP|r] |cff00aa008.0.7|r ## Version: 8.0.7 +======= +## Interface: 11500 +## Title: Titan Panel [|cffeda55fXP|r] |cff00aa008.0.8|r +## Version: 8.0.8 +>>>>>>> origin/master ## Notes: Adds information to Titan Panel about XP earned and time to level ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: diff --git a/TitanXP/TitanXP_Wrath.toc b/TitanXP/TitanXP_Wrath.toc index 94d7812..896d868 100644 --- a/TitanXP/TitanXP_Wrath.toc +++ b/TitanXP/TitanXP_Wrath.toc @@ -1,6 +1,6 @@ ## Interface: 30403 -## Title: Titan Panel [|cffeda55fXP|r] |cff00aa008.0.7|r -## Version: 8.0.7 +## Title: Titan Panel [|cffeda55fXP|r] |cff00aa008.0.8|r +## Version: 8.0.8 ## Notes: Adds information to Titan Panel about XP earned and time to level ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: