RRRRHHHH_Code
Changeset c92b616b1406bb5ff52624836f0608e8c5062451
Committed by pinene on Tue 19 May, 2015 19:44:47 +0000
Commit Message:
Merge branch ‘master’ of ssh://xp-dev.com/RRRRHHHH_Code
Conflicts:
ruralHouses client/src/gui/ModifyOfferGUI.java
ruralHouses/src/dataAccess/DB4oManager.java
Changes
Modified ruralHouses client/src/domain/Administrator.java Diff
Modified ruralHouses client/src/domain/Booking.java Diff
Modified ruralHouses client/src/gui/ModifyOfferGUI.java Diff
Modified ruralHouses client/src/gui/OwnerRegistrationGUI.java Diff
Modified ruralHouses client/src/gui/StartWindow.java Diff
Modified ruralHouses client/src/gui/listOfBookingRequestsGUI.java Diff
Modified ruralHouses client/src/gui/listOfOwnerAddittionRequests.java Diff
Modified ruralHouses/src/businessLogic/LoginManager.java Diff
Modified ruralHouses/src/dataAccess/DB4oManager.java Diff
Modified ruralHouses/src/domain/Account.java Diff
Modified ruralHouses/src/domain/Booking.java Diff