From: camjan <jcampos004@ikasle.ehu.es>
Date: Tue, 10 Mar 2015 13:09:05 +0000 (+0100)
Subject: Merge branch 'master' of https://xp-dev.com/git/RRRRHHHH_Code
X-Git-Url: https://xp-dev.com/git/RRRRHHHH_Code/commitdiff_plain/6d133a3e08f76a40561b3b4646ee458b03eebfc6

Merge branch 'master' of https://xp-dev.com/git/RRRRHHHH_Code

Conflicts:
	ruralHouses/src/gui/DeleteHouseGUI.java
---

6d133a3e08f76a40561b3b4646ee458b03eebfc6
diff --cc ruralHouses/src/gui/DeleteHouseGUI.java
index 776cc51,d5c4386..b023c5a
--- a/ruralHouses/src/gui/DeleteHouseGUI.java
+++ b/ruralHouses/src/gui/DeleteHouseGUI.java
@@@ -37,10 -36,11 +37,10 @@@ public class DeleteHouseGUI extends JFr
  		contentPane = new JPanel();
  		contentPane.setBorder(new EmptyBorder(5, 5, 5, 5));
  		setContentPane(contentPane);
 -
 -		o.getRuralHouses();
 -		
 -		comboBox = new JComboBox(o.getRuralHouses());
 +			
 +		comboBox = new JComboBox(this.owner.getRuralHouses());
  		
- 		
++
  		JRadioButton rdbtnIAmSure = new JRadioButton("I am sure");
  		
  		JButton btnDelete = new JButton("DELETE");