Merge

2015-03-10 12:59:54 +00:00
parent a315bdda59 b47ea12829
commit ef2c491872
3 changed files with 29 additions and 22 deletions
@@ -106,11 +106,13 @@ public class Panel extends JPanel {
 	}


+
 	public void setBackground(BufferedImage background) {
 		this.background = background;
 	}


+
 	public ArrayList<DrawObject> getObjects() {
 		return objects;
 	}