projects / RRRRHHHH_Code / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: ccac997)
Merge branch 'master' of ssh://xp-dev.com/RRRRHHHH_Code
authorpinene <epinzolas001@ikasle.ehu.eus>
Wed, 20 May 2015 16:42:17 +0000 (18:42 +0200)
committerpinene <epinzolas001@ikasle.ehu.eus>
Wed, 20 May 2015 16:42:17 +0000 (18:42 +0200)
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


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