projects / RRRRHHHH_Code / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 4bc36b7)
Merge branch 'master' of https://xp-dev.com/git/RRRRHHHH_Code
authorcamjan <jcampos004@ikasle.ehu.es>
Tue, 19 May 2015 23:23:13 +0000 (01:23 +0200)
committercamjan <jcampos004@ikasle.ehu.es>
Tue, 19 May 2015 23:23:13 +0000 (01:23 +0200)
Conflicts:
ruralHouses client/src/gui/HouseFeaturesGUI.java
ruralHouses client/src/gui/ModifyOfferGUI.java
ruralHouses/src/domain/RuralHouse.java


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