Merged up to current

This commit is contained in:
Mark Langen 2016-09-01 15:44:14 -06:00
commit 463576dbd0
220 changed files with 68405 additions and 29458 deletions

View file

@ -91,7 +91,7 @@ public class AboutDialog extends MageDialog {
jLabel3.setText("Devs: BetaSteward, Noxx, Eugen.Rivniy, North, LevelX2, Jeff, Plopman, dustinconrad, emerald000.,");
jLabel4.setText("fireshoes, lunaskyrise, mnapoleon, jgod, LoneFox.");
jLabel4.setText("fireshoes, lunaskyrise, mnapoleon, jgod, LoneFox, drmDev, spjspj.");
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
getContentPane().setLayout(layout);