Merge branch 'master' of https://xp-dev.com/git/RRRRHHHH_Code
authorepinzolas001 <epinzolas001@g004972.gi.ehu.es>
Fri, 27 Feb 2015 12:08:52 +0000 (13:08 +0100)
committerepinzolas001 <epinzolas001@g004972.gi.ehu.es>
Fri, 27 Feb 2015 12:08:52 +0000 (13:08 +0100)
Conflicts:
ruralHouses/db/DBjcampos004.yap
ruralHouses/src/gui/IntroduceOfferGUI.java


No differences found