biglad
11-19-2009, 06:40 PM
local merge
Site/wow1/pages/Import_Service.inc.php (http://bitbucket.org/Azrael/mgacore2/src/45263fdb22bd/Site/wow1/pages/Import_Service.inc.php) (26 lines added, 0 lines removed)
Site/wow1/news_pages/news1.php (http://bitbucket.org/Azrael/mgacore2/src/45263fdb22bd/Site/wow1/news_pages/news1.php) (24 lines added, 21 lines removed)
Site/wow1/index.php (http://bitbucket.org/Azrael/mgacore2/src/45263fdb22bd/Site/wow1/index.php) (245 lines added, 244 lines removed)
sql/MGA/MISC Fix's.sql (http://bitbucket.org/Azrael/mgacore2/src/45263fdb22bd/sql/MGA/MISC%20Fix%27s.sql) (18 lines added, 1674 lines removed)
Site/wow1/sig/config/config.ini (http://bitbucket.org/Azrael/mgacore2/src/45263fdb22bd/Site/wow1/sig/config/config.ini) (81 lines added, 80 lines removed)
Site/wow1/banned-check/banned-check.php (http://bitbucket.org/Azrael/mgacore2/src/45263fdb22bd/Site/wow1/banned-check/banned-check.php) (69 lines added, 68 lines removed)
src/game/SpellEffects.cpp (http://bitbucket.org/Azrael/mgacore2/src/45263fdb22bd/src/game/SpellEffects.cpp) (2 lines added, 2 lines removed)
Site/wow1/server_stats/db.php (http://bitbucket.org/Azrael/mgacore2/src/45263fdb22bd/Site/wow1/server_stats/db.php) (26 lines added, 26 lines removed)
sql/MGA/TDB Forum Fix's.sql (http://bitbucket.org/Azrael/mgacore2/src/45263fdb22bd/sql/MGA/TDB%20Forum%20Fix%27s.sql) (1708 lines added, 0 lines removed)
sql/Violethold/violethold.sql (http://bitbucket.org/Azrael/mgacore2/src/45263fdb22bd/sql/Violethold/violethold.sql) (0 lines added, 14 lines removed)
More... (http://bitbucket.org/Azrael/mgacore2/changeset/45263fdb22bd/)
Site/wow1/pages/Import_Service.inc.php (http://bitbucket.org/Azrael/mgacore2/src/45263fdb22bd/Site/wow1/pages/Import_Service.inc.php) (26 lines added, 0 lines removed)
Site/wow1/news_pages/news1.php (http://bitbucket.org/Azrael/mgacore2/src/45263fdb22bd/Site/wow1/news_pages/news1.php) (24 lines added, 21 lines removed)
Site/wow1/index.php (http://bitbucket.org/Azrael/mgacore2/src/45263fdb22bd/Site/wow1/index.php) (245 lines added, 244 lines removed)
sql/MGA/MISC Fix's.sql (http://bitbucket.org/Azrael/mgacore2/src/45263fdb22bd/sql/MGA/MISC%20Fix%27s.sql) (18 lines added, 1674 lines removed)
Site/wow1/sig/config/config.ini (http://bitbucket.org/Azrael/mgacore2/src/45263fdb22bd/Site/wow1/sig/config/config.ini) (81 lines added, 80 lines removed)
Site/wow1/banned-check/banned-check.php (http://bitbucket.org/Azrael/mgacore2/src/45263fdb22bd/Site/wow1/banned-check/banned-check.php) (69 lines added, 68 lines removed)
src/game/SpellEffects.cpp (http://bitbucket.org/Azrael/mgacore2/src/45263fdb22bd/src/game/SpellEffects.cpp) (2 lines added, 2 lines removed)
Site/wow1/server_stats/db.php (http://bitbucket.org/Azrael/mgacore2/src/45263fdb22bd/Site/wow1/server_stats/db.php) (26 lines added, 26 lines removed)
sql/MGA/TDB Forum Fix's.sql (http://bitbucket.org/Azrael/mgacore2/src/45263fdb22bd/sql/MGA/TDB%20Forum%20Fix%27s.sql) (1708 lines added, 0 lines removed)
sql/Violethold/violethold.sql (http://bitbucket.org/Azrael/mgacore2/src/45263fdb22bd/sql/Violethold/violethold.sql) (0 lines added, 14 lines removed)
More... (http://bitbucket.org/Azrael/mgacore2/changeset/45263fdb22bd/)