Merge origin/master

This commit is contained in:
LevelX2 2016-02-27 09:28:01 +01:00
commit 56294eac50
4 changed files with 4 additions and 4 deletions

View file

@ -169,8 +169,6 @@ public class DeckEditorPanel extends javax.swing.JPanel {
if (deck != null) {
this.cardSelector.loadSideboard(new ArrayList<>(deck.getSideboard()), this.bigCard);
}
// TODO: take from preferences
this.cardSelector.switchToGrid();
this.btnExit.setVisible(false);
this.btnImport.setVisible(false);