Commit b09d541f authored by Ivaria's avatar Ivaria

Merge branch 'master' into classic

parents 884817dc 16f81ef8
......@@ -15,9 +15,10 @@ externals:
Libs/AceConfig-3.0: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceConfig-3.0
Libs/AceBucket-3.0: https://repos.wowace.com/wow/ace3/trunk/AceBucket-3.0
Libs/AceEvent-3.0: https://repos.wowace.com/wow/ace3/trunk/AceEvent-3.0
Libs/AceTimer-3.0: https://repos.wowace.com/wow/ace3/trunk/AceTimer-3.0
Libs/AceSerializer-3.0: https://repos.wowace.com/wow/ace3/trunk/AceSerializer-3.0
Libs/AceComm-3.0: https://repos.wowace.com/wow/ace3/trunk/AceComm-3.0
Libs/AceComm-3.0: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceComm-3.0
Libs/AceLocale-3.0: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceLocale-3.0
Libs/AceTimer-3.0: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceTimer-3.0
Libs/AceSerializer-3.0: svn://svn.wowace.com/wow/ace3/mainline/trunk/AceSerializer-3.0
Libs/LibSharedMedia-3.0: svn://svn.wowace.com/wow/libsharedmedia-3-0/mainline/trunk/LibSharedMedia-3.0
Libs/LibDataBroker-1.1: git://git.wowace.com/wow/libdatabroker-1-1/mainline.git
Libs/UTF8: svn://svn.wowace.com/wow/utf8/mainline/trunk
......
......@@ -6,9 +6,10 @@
<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="AceConfig-3.0\AceConfig-3.0.xml" />
<Include file="AceComm-3.0\AceComm-3.0.xml" />
<Include file="AceLocale-3.0\AceLocale-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"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment