Git Repository Public Repository

RRRRHHHH_Code

URLs

Copy to Clipboard
 
08aaf3b19060c67249a3f3e206690c260e881713

Commits for RRRRHHHH_CoderuralHouses client/src/domain/Administrator.java

Diff revisions: vs.
Revision Author Commited Message
08aaf3 ... Diff Diff camjan Wed 20 May, 2015 21:26:51 +0000

Started with the separated DB with the given code

ccac99 ... Diff Diff pinene picture pinene Wed 20 May, 2015 16:42:17 +0000

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

d30bcc ... Diff Diff pinene picture pinene Wed 20 May, 2015 16:32:33 +0000

cleaning

25898b ... Diff Diff camjan Mon 18 May, 2015 15:26:01 +0000

Account adding and deleting fixed

4f8bcc ... epinzolas001 Mon 18 May, 2015 09:49:54 +0000

Merge conflicts solutioned