xp-dev.com Git - RRRRHHHH

author	pinene <epinzolas001@ikasle.ehu.eus>
	Wed, 20 May 2015 16:42:17 +0000 (18:42 +0200)
committer	pinene <epinzolas001@ikasle.ehu.eus>
	Wed, 20 May 2015 16:42:17 +0000 (18:42 +0200)
commit	ccac9974c8183f7f0d30e8cabd84ee0386e8cd97
tree	65c4c73ca576c77cff9aaa058218ded64c91d938	tree \| snapshot
parent	d30bcc8a3c13bbf5144b03a644c1345865aed708	commit \| diff
parent	1be83364e3fc670bad06c597aea78cc389752f4a	commit \| diff

Merge branch 'master' of ssh://xp-dev.com/RRRRHHHH_Code

Conflicts:
ruralHouses client/src/domain/Owner.java
ruralHouses client/src/domain/RuralHouse.java
ruralHouses client/src/gui/BookRuralHouseConfirmationWindow.java
ruralHouses client/src/gui/ModifyOfferGUI.java
ruralHouses/src/dataAccess/DB4oManager.java
ruralHouses/src/domain/Booking.java

32 files changed:

ruralHouses client/src/common/BookingInterface.java	diff1 \|	diff2 \|	blob \| history
ruralHouses client/src/domain/Administrator.java	diff1 \|	diff2 \|	blob \| history
ruralHouses client/src/domain/Owner.java	diff1 \|	diff2 \|	blob \| history
ruralHouses client/src/domain/RuralHouse.java	diff1 \|	diff2 \|	blob \| history
ruralHouses client/src/gui/BookRuralHouseConfirmationWindow.java	diff1 \|	diff2 \|	blob \| history
ruralHouses client/src/gui/DeleteOwnerGUI.java	\|	diff2 \|	blob \| history
ruralHouses client/src/gui/HouseFeaturesGUI.java	diff1 \|	diff2 \|	blob \| history
ruralHouses client/src/gui/ModifyOfferGUI.java	diff1 \|	diff2 \|	blob \| history
ruralHouses client/src/gui/listOfOffers.java	diff1 \|	diff2 \|	blob \| history
ruralHouses/src/businessLogic/AdminManager.java	diff1 \|	diff2 \|	blob \| history
ruralHouses/src/businessLogic/BookingManager.java	diff1 \|	diff2 \|	blob \| history
ruralHouses/src/common/BookingInterface.java	diff1 \|	diff2 \|	blob \| history
ruralHouses/src/dataAccess/DB4oManager.java	diff1 \|	diff2 \|	blob \| history
ruralHouses/src/domain/Account.java	diff1 \|	diff2 \|	blob \| history
ruralHouses/src/domain/Administrator.java	diff1 \|	diff2 \|	blob \| history
ruralHouses/src/domain/Booking.java	diff1 \|	diff2 \|	blob \| history
ruralHouses/src/domain/Client.java	diff1 \|	diff2 \|	blob \| history
ruralHouses/src/domain/Owner.java	diff1 \|	diff2 \|	blob \| history
ruralHouses/src/domain/RuralHouse.java	diff1 \|	diff2 \|	blob \| history
ruralHouses/src/gui/AdminMenuGUI.java	diff1 \|	\|	blob \| history
ruralHouses/src/gui/BookRuralHouseConfirmationWindow.java	diff1 \|	\|	blob \| history
ruralHouses/src/gui/DeleteOfferGUI.java	diff1 \|	\|	blob \| history
ruralHouses/src/gui/DeleteOwnerGUI.java	\|	\|	blob
ruralHouses/src/gui/HouseFeaturesGUI.java	diff1 \|	\|	blob \| history
ruralHouses/src/gui/ModifyHouseGUI.java	diff1 \|	\|	blob \| history
ruralHouses/src/gui/ModifyOfferGUI.java	diff1 \|	\|	blob \| history
ruralHouses/src/gui/OwnerRegistrationGUI.java	diff1 \|	\|	blob \| history
ruralHouses/src/gui/listOfAdditionRequestsGUI.java	diff1 \|	\|	blob \| history
ruralHouses/src/gui/listOfBookingRequestsGUI.java	diff1 \|	\|	blob \| history
ruralHouses/src/gui/listOfOffers.java	diff1 \|	\|	blob \| history
ruralHouses/src/gui/listOfOwnerAddittionRequests.java	diff1 \|	\|	blob \| history
ruralHouses/src/gui/listOfRemovalRequestsGUI.java	diff1 \|	\|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

ruralHouses client/src/common/BookingInterface.java	diff1 \|	diff2 \|	blob \| history
ruralHouses client/src/domain/Administrator.java	diff1 \|	diff2 \|	blob \| history
ruralHouses client/src/domain/Owner.java	diff1 \|	diff2 \|	blob \| history
ruralHouses client/src/domain/RuralHouse.java	diff1 \|	diff2 \|	blob \| history
ruralHouses client/src/gui/BookRuralHouseConfirmationWindow.java	diff1 \|	diff2 \|	blob \| history
ruralHouses client/src/gui/DeleteOwnerGUI.java	\|	diff2 \|	blob \| history
ruralHouses client/src/gui/HouseFeaturesGUI.java	diff1 \|	diff2 \|	blob \| history
ruralHouses client/src/gui/ModifyOfferGUI.java	diff1 \|	diff2 \|	blob \| history
ruralHouses client/src/gui/listOfOffers.java	diff1 \|	diff2 \|	blob \| history
ruralHouses/src/businessLogic/AdminManager.java	diff1 \|	diff2 \|	blob \| history
ruralHouses/src/businessLogic/BookingManager.java	diff1 \|	diff2 \|	blob \| history
ruralHouses/src/common/BookingInterface.java	diff1 \|	diff2 \|	blob \| history
ruralHouses/src/dataAccess/DB4oManager.java	diff1 \|	diff2 \|	blob \| history
ruralHouses/src/domain/Account.java	diff1 \|	diff2 \|	blob \| history
ruralHouses/src/domain/Administrator.java	diff1 \|	diff2 \|	blob \| history
ruralHouses/src/domain/Booking.java	diff1 \|	diff2 \|	blob \| history
ruralHouses/src/domain/Client.java	diff1 \|	diff2 \|	blob \| history
ruralHouses/src/domain/Owner.java	diff1 \|	diff2 \|	blob \| history
ruralHouses/src/domain/RuralHouse.java	diff1 \|	diff2 \|	blob \| history
ruralHouses/src/gui/AdminMenuGUI.java	diff1 \|	\|	blob \| history
ruralHouses/src/gui/BookRuralHouseConfirmationWindow.java	diff1 \|	\|	blob \| history
ruralHouses/src/gui/DeleteOfferGUI.java	diff1 \|	\|	blob \| history
ruralHouses/src/gui/DeleteOwnerGUI.java	\|	\|	blob
ruralHouses/src/gui/HouseFeaturesGUI.java	diff1 \|	\|	blob \| history
ruralHouses/src/gui/ModifyHouseGUI.java	diff1 \|	\|	blob \| history
ruralHouses/src/gui/ModifyOfferGUI.java	diff1 \|	\|	blob \| history
ruralHouses/src/gui/OwnerRegistrationGUI.java	diff1 \|	\|	blob \| history
ruralHouses/src/gui/listOfAdditionRequestsGUI.java	diff1 \|	\|	blob \| history
ruralHouses/src/gui/listOfBookingRequestsGUI.java	diff1 \|	\|	blob \| history
ruralHouses/src/gui/listOfOffers.java	diff1 \|	\|	blob \| history
ruralHouses/src/gui/listOfOwnerAddittionRequests.java	diff1 \|	\|	blob \| history
ruralHouses/src/gui/listOfRemovalRequestsGUI.java	diff1 \|	\|	blob \| history