Merge branch 'master' of ssh://109.200.159.85/var/lib/git/mage

This commit is contained in:
BetaSteward 2012-01-24 22:52:38 -05:00
commit 436a8ea440
57 changed files with 1991 additions and 723 deletions

6
.gitignore vendored
View file

@ -9,6 +9,7 @@ Mage.Plugins/Mage.Card.Plugin/target
Mage.Plugins/Mage.Counter.Plugin/target
Mage.Plugins/Mage.Theme.Plugin/target
Mage.Plugins/Mage.Rating.Plugin/target
Mage.Server.Console/target/
Mage.Server.Plugins/Mage.Deck.Constructed/target
Mage.Server.Plugins/Mage.Deck.Limited/target
Mage.Server.Plugins/Mage.Game.FreeForAll/target
@ -16,6 +17,7 @@ Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/target
Mage.Server.Plugins/Mage.Player.AI/target
Mage.Server.Plugins/Mage.Player.AIMinimax/target
Mage.Server.Plugins/Mage.Player.AI.MA/target
Mage.Server.Plugins/Mage.Player.AIMCTS/target
Mage.Server.Plugins/Mage.Player.Human/target
Mage.Server.Plugins/Mage.Draft.8PlayerBooster/target
Mage.Server.Plugins/Mage.Tournament.BoosterDraft/target
@ -24,6 +26,7 @@ Mage.Server/target
Mage.Sets/target
Mage.Tests/target
Mage/target
Utils/GathererCrawler/target
releases
Utils/author.txt
@ -40,7 +43,6 @@ syntax: regexp
nbactions.xml
glob:Mage.Client/cheat.dck
glob:Mage.Client/test.dck
glob:Mage.Server.Console/target/
Mage.Server.Plugins/Mage.Draft.8PlayerBooster/target
\.orig\..*$
@ -49,4 +51,4 @@ Mage.Server.Plugins/Mage.Draft.8PlayerBooster/target
\.rej$
\.conflict\~$
/Mage.Server.Plugins/Mage.Player.AIMCTS/target/
/Mage.Server.Console/target/
/Mage.Server.Console/target/