Merge with backout

This commit is contained in:
magenoxx 2011-05-12 09:20:32 +04:00
commit 5502098e65
2 changed files with 1 additions and 3 deletions

View file

@ -1,5 +1,5 @@
#default levels #default levels
log4j.rootLogger=info, logfile log4j.rootLogger=info, console
#console log #console log
log4j.appender.console=org.apache.log4j.ConsoleAppender log4j.appender.console=org.apache.log4j.ConsoleAppender

View file

@ -21,7 +21,6 @@
<include>org.mage:Mage-Deck-Limited</include> <include>org.mage:Mage-Deck-Limited</include>
<include>org.mage:Mage-Game-FreeForAll</include> <include>org.mage:Mage-Game-FreeForAll</include>
<include>org.mage:Mage-Game-TwoPlayerDuel</include> <include>org.mage:Mage-Game-TwoPlayerDuel</include>
<include>org.mage:Mage-Player-AI</include>
<include>org.mage:Mage-Player-AIMinimax</include> <include>org.mage:Mage-Player-AIMinimax</include>
<include>org.mage:Mage-Player-AI-MA</include> <include>org.mage:Mage-Player-AI-MA</include>
<include>org.mage:Mage-Player-Human</include> <include>org.mage:Mage-Player-Human</include>
@ -37,7 +36,6 @@
<exclude>org.mage:Mage-Deck-Limited</exclude> <exclude>org.mage:Mage-Deck-Limited</exclude>
<exclude>org.mage:Mage-Game-FreeForAll</exclude> <exclude>org.mage:Mage-Game-FreeForAll</exclude>
<exclude>org.mage:Mage-Game-TwoPlayerDuel</exclude> <exclude>org.mage:Mage-Game-TwoPlayerDuel</exclude>
<exclude>org.mage:Mage-Player-AI</exclude>
<exclude>org.mage:Mage-Player-AIMinimax</exclude> <exclude>org.mage:Mage-Player-AIMinimax</exclude>
<exclude>org.mage:Mage-Player-AI-MA</exclude> <exclude>org.mage:Mage-Player-AI-MA</exclude>
<exclude>org.mage:Mage-Player-Human</exclude> <exclude>org.mage:Mage-Player-Human</exclude>