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)
commit8bf31b380026a40c5ba48495b862a73377460de0
treed4c161ee1d9e299854b442f3d534f7a0ba39a102
parent1a30aec4aa0112eeed6bcac4a42880613a124a7b
parentc51acfe72996e440259af7da10c89a33fd059e2a
Merge branch 'master' of https://xp-dev.com/git/RRRRHHHH_Code

Conflicts:
ruralHouses/db/DBjcampos004.yap
ruralHouses/src/gui/IntroduceOfferGUI.java
ruralHouses/.gitignore
ruralHouses/db/DBjcampos004.yap
ruralHouses/src/gui/IntroduceOfferGUI.java
ruralHouses/src/gui/StartWindow.java