Merge branch 'master' into classic

Libs/Libs.xml

+<Ui xmlns="http://www.blizzard.com/wow/ui/" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://www.blizzard.com/wow/ui/ ..\FrameXML\UI.xsd">
+
+	<Script file="LibStub\LibStub.lua"/>
+
+	<Include file="CallbackHandler-1.0\CallbackHandler-1.0.xml"/>
+	<Include file="AceAddon-3.0\AceAddon-3.0.xml" />
+	<Include file="AceComm-3.0\AceComm-3.0.xml" />
+	<Include file="AceConfig-3.0\AceConfig-3.0.xml" />
+	<Include file="AceGUI-3.0\AceGUI-3.0.xml" />
+	<Include file="AceSerializer-3.0\AceSerializer-3.0.xml" />
+	<Include file="AceTimer-3.0\AceTimer-3.0.xml" />
+	<Script file="LibDataBroker-1.1\LibDataBroker-1.1.lua"/>
+	<Include file="LibSharedMedia-3.0\lib.xml" />
+	<Script file="LibDBIcon-1.0\LibDBIcon-1.0.lua"/>
+	<Script file="UTF8\utf8.lua" />
+	<Script file="UTF8\utf8data.lua" />
+	<Include file="LibCompress\lib.xml"/>
+	<Script file="LibBase64-1.0\LibBase64-1.0.lua" />
+	<Include file="LibCustomGlow-1.0\LibCustomGlow-1.0.xml" />
+	<Include file="NickTag-1.0\NickTag-1.0.xml" />
+
+	<Include file="LibThreatClassic2\lib.xml" />
+	<Include file="!LibTotemInfo\embeds.xml" />
+	<Include file="LibClassicDurations\LibClassicDurations.xml" />
+	<Include file="LibHealComm-4.0\LibHealComm-4.0.xml" />
+
+</Ui>

VuhDo.toc

@@ -9,21 +9,10 @@
 ## DefaultState: Enabled
 ## LoadOnDemand: 0
 
-Libs\AceAddon-3.0\AceAddon-3.0.xml
-Libs\AceGUI-3.0\AceGUI-3.0.xml
-Libs\AceConfig-3.0\AceConfig-3.0.xml
-Libs\AceBucket-3.0\AceBucket-3.0.xml
-Libs\AceComm-3.0\AceComm-3.0.xml
-Libs\AceEvent-3.0\AceEvent-3.0.xml
-Libs\AceTimer-3.0\AceTimer-3.0.xml
-Libs\AceSerializer-3.0\AceSerializer-3.0.xml
-Libs\UTF8\utf8.lua
-Libs\UTF8\utf8data.lua
-Libs\LibThreatClassic2\lib.xml
-Libs\!LibTotemInfo\embeds.xml
-Libs\NickTag-1.0\NickTag-1.0.xml
+Libs\Libs.xml
 
 VuhDo.xml
+
 VuhDoPanel.xml
 VuhDoBuffWatch.xml
 

VuhDo.xml

@@ -2,19 +2,6 @@
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xsi:schemaLocation="http://www.blizzard.com/wow/ui/ ..\FrameXML\UI.xsd">
 
-	<Script file="Libs\LibStub\LibStub.lua" />
-	<Script file="Libs\CallbackHandler-1.0\CallbackHandler-1.0.lua" />
-	<Script file="Libs\LibDataBroker-1.1\LibDataBroker-1.1.lua" />
-	<Script file="Libs\LibSharedMedia-3.0\LibSharedMedia-3.0.lua" />
-	<Script file="Libs\UTF8\utf8.lua" />
-	<Script file="Libs\LibCompress\LibCompress.lua" />
-	<Script file="Libs\LibBase64-1.0\LibBase64-1.0.lua" />
-	<Script file="Libs\LibDBIcon-1.0\LibDBIcon-1.0.lua" />
-	<Script file="Libs\LibCustomGlow-1.0\LibCustomGlow-1.0.lua" />
-
-	<Include file="Libs\LibClassicDurations\LibClassicDurations.xml"/>
-	<Include file="Libs\LibHealComm-4.0\LibHealComm-4.0.xml" />		
-
 	<Script file="VuhDoLocalization_en.lua" />
 	<Script file="VuhDoLocalization_de.lua" />
 	<Script file="VuhDoLocalization_fr.lua" />