WoWInterface SVN bdCore

Compare Revisions

  • This comparison shows the changes necessary to convert path 
    /trunk/config
    from Rev 5 to Rev 6
    ↔ Reverse comparison
  •

Rev 5 → Rev 6

defaults.lua
16,6 → 16,7
 
bdCore.media = {
flat = "Interface\\Buttons\\WHITE8x8",
arial = "fonts\\ARIALN.ttf",
font = "Interface\\Addons\\bdCore\\media\\font.ttf",
arrow = "Interface\\Addons\\bdCore\\media\\arrow.blp",
arrowup = "Interface\\Addons\\bdCore\\media\\arrowup.blp",
28,6 → 29,27
green = {.1, .7, 0.3, 1},
}
 
<<<<<<< .mine
 
-- if our font doesn't load for some reason, default to arial.
-- local fonttest = bdCore:CreateFontString()
-- fonttest:SetFont(bdCore.media.font,12)
-- if (not fonttest:GetFont()) then
-- bdCore.media.font = bdCore.media.arial
-- end
 
bdCore.general = {}
bdCore.general[#bdCore.general+1] = {border = {
type = "slider",
value = 2,
min = 0,
max = 2,
step = 1,
callback = function() bdCore:triggerEvent("bdcore_redraw") end
}}
 
||||||| .r4
=======
bdCore.generalconfig = {}
bdCore.generalconfig[#bdCore.generalconfig+1] = {border = {
type = "slider",
39,6 → 61,7
--callback = function() bdCore:redraw() end
}}
 
>>>>>>> .r5
bdCore.whitelistconfig = {
[1] = {intro = {
type = "text",