Merge branch 'master' of https://xp-dev.com/git/RRRRHHHH_Code
authorcamjan <jcampos004@ikasle.ehu.es>
Tue, 10 Mar 2015 13:09:05 +0000 (14:09 +0100)
committercamjan <jcampos004@ikasle.ehu.es>
Tue, 10 Mar 2015 13:09:05 +0000 (14:09 +0100)
commit6d133a3e08f76a40561b3b4646ee458b03eebfc6
tree0306306e3100f609a2db8b5a587d56d198b8086c
parent704edcb9f965177286a0d3616b1c4440f47d8ca2
parent5c77c50befceaa37bef22e6b6539966e6cb24339
Merge branch 'master' of https://xp-dev.com/git/RRRRHHHH_Code

Conflicts:
ruralHouses/src/gui/DeleteHouseGUI.java
ruralHouses/src/businessLogic/HouseManager.java
ruralHouses/src/gui/DeleteHouseGUI.java