Merge branch 'master' of ssh://xp-dev.com/RRRRHHHH_Code
authorpinene <epinzolas001@ikasle.ehu.eus>
Tue, 19 May 2015 19:44:47 +0000 (21:44 +0200)
committerpinene <epinzolas001@ikasle.ehu.eus>
Tue, 19 May 2015 19:44:47 +0000 (21:44 +0200)
commitc92b616b1406bb5ff52624836f0608e8c5062451
treeba16a9d319c06d7884b988523f8e1872ff69cf0e
parent998673e9c0bf454324f8036d2cb0d2936899b4f6
parent25898b619dd708c9f15a44200b545cac11404b73
Merge branch 'master' of ssh://xp-dev.com/RRRRHHHH_Code

Conflicts:
ruralHouses client/src/gui/ModifyOfferGUI.java
ruralHouses/src/dataAccess/DB4oManager.java
ruralHouses client/src/gui/ModifyOfferGUI.java
ruralHouses/src/dataAccess/DB4oManager.java
ruralHouses/src/domain/Account.java