Merge branch 'master' of https://xp-dev.com/git/RRRRHHHH_Code
authorpinene <epinzolas001@ikasle.ehu.es>
Sun, 19 Apr 2015 14:18:02 +0000 (16:18 +0200)
committerpinene <epinzolas001@ikasle.ehu.es>
Sun, 19 Apr 2015 14:18:02 +0000 (16:18 +0200)
commit42679bcd0e79750f8a1ec7c2388cd4d675de58f1
tree15f798e5add552857459bcdcac58afd2f7042f24
parent520867d5e278316fe874703c30b89de67ff5d82d
parente3c426ede6bbb9091b76a1315e6b479e49453319
Merge branch 'master' of https://xp-dev.com/git/RRRRHHHH_Code

Conflicts:
ruralHouses/src/businessLogic/OfferManager.java
ruralHouses/src/gui/HouseFeaturesGUI.java
ruralHouses/src/gui/ModifyHouseGUI.java
ruralHouses/src/gui/StartWindow.java
ruralHouses/src/businessLogic/OfferManager.java
ruralHouses/src/gui/HouseFeaturesGUI.java
ruralHouses/src/gui/ModifyHouseGUI.java
ruralHouses/src/gui/StartWindow.java