RRRRHHHH_Code - RuralHouses(willCodeForFood) - Changeset 4bc36b7ddf2a9626f60c551cf999ec24052087cc on RRRRHHHH_Code - Powered by XP-Dev.com

Git Repository

Public Repository

RRRRHHHH_Code

URLs

Copy to Clipboard

Explore

Commits

Changeset 4bc36b7ddf2a9626f60c551cf999ec24052087cc

Committed by camjan on Tue 19 May, 2015 23:23:13 +0000

Commit Message:

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

Changes

Modified ruralHouses client/.classpath Diff

Modified ruralHouses client/src/common/AccountInterface.java Diff

Modified ruralHouses client/src/common/HouseInterface.java Diff

Modified ruralHouses client/src/common/OfferInterface.java Diff

Modified ruralHouses client/src/gui/AdminMenuGUI.java Diff

Modified ruralHouses client/src/gui/DeleteOwnerGUI.java Diff

Modified ruralHouses client/src/gui/HouseFeaturesGUI.java Diff

Modified ruralHouses client/src/gui/ModifyHouseGUI.java Diff

Modified ruralHouses client/src/gui/ModifyOfferGUI.java Diff

Modified ruralHouses client/src/gui/OffersRelatedOwnerGUI.java Diff

Modified ruralHouses client/src/gui/QueryAvailabilityGUI2.java Diff

Modified ruralHouses client/src/gui/listOfBookingRequestsGUI.java Diff

Modified ruralHouses/.classpath Diff

Modified ruralHouses/src/businessLogic/AccountManager.java Diff

Modified ruralHouses/src/businessLogic/BookingManager.java Diff

Modified ruralHouses/src/businessLogic/HouseManager.java Diff

Modified ruralHouses/src/businessLogic/OfferManager.java Diff

Modified ruralHouses/src/common/AccountInterface.java Diff

Modified ruralHouses/src/common/HouseInterface.java Diff

Modified ruralHouses/src/common/OfferInterface.java Diff

Modified ruralHouses/src/dataAccess/DB4oManager.java Diff

Modified ruralHouses/src/domain/Account.java Diff

Modified ruralHouses/src/domain/Owner.java Diff

Modified ruralHouses/src/domain/RuralHouse.java Diff