Merge branch 'master' of https://xp-dev.com/git/RRRRHHHH_Code
authorcamjan <jcampos004@ikasle.ehu.es>
Tue, 19 May 2015 23:23:13 +0000 (01:23 +0200)
committercamjan <jcampos004@ikasle.ehu.es>
Tue, 19 May 2015 23:23:13 +0000 (01:23 +0200)
commit4bc36b7ddf2a9626f60c551cf999ec24052087cc
treeb816aa69ee4a59d7a4e8161129093ebc597787e0
parente90cb4313afcb055dc132e18d8f41b9f71370eb2
parentc92b616b1406bb5ff52624836f0608e8c5062451
Merge branch 'master' of https://xp-dev.com/git/RRRRHHHH_Code

Conflicts:
ruralHouses client/src/gui/HouseFeaturesGUI.java
ruralHouses client/src/gui/ModifyOfferGUI.java
ruralHouses/src/domain/RuralHouse.java
14 files changed:
ruralHouses client/src/common/AccountInterface.java
ruralHouses client/src/gui/AdminMenuGUI.java
ruralHouses client/src/gui/DeleteOwnerGUI.java
ruralHouses client/src/gui/HouseFeaturesGUI.java
ruralHouses client/src/gui/ModifyHouseGUI.java
ruralHouses client/src/gui/ModifyOfferGUI.java
ruralHouses client/src/gui/listOfBookingRequestsGUI.java
ruralHouses/src/businessLogic/AccountManager.java
ruralHouses/src/businessLogic/BookingManager.java
ruralHouses/src/businessLogic/OfferManager.java
ruralHouses/src/common/AccountInterface.java
ruralHouses/src/dataAccess/DB4oManager.java
ruralHouses/src/domain/Account.java
ruralHouses/src/domain/RuralHouse.java