merge banaan dev

2015-04-07 19:35:38 +02:00
parent 32de28204c 98af73b15e
commit f2c1544d71
8 changed files with 84 additions and 16 deletions
@@ -82,8 +82,12 @@ public class MenuBar extends JMenuBar {
 			public void actionPerformed(ActionEvent e) {
 				if(JOptionPane.showConfirmDialog(null, "Are you sure you want to close this program?", "Close Agenda", JOptionPane.YES_NO_OPTION) == JOptionPane.OK_OPTION)
 				{
+<<<<<<< HEAD
 					w.setVisible(false);
 					w.dispose();
+=======
+					System.exit(0);
+>>>>>>> origin/Banaan
 				}
 			}
 		});