Merge branch 'master' of https://xp-dev.com/git/RRRRHHHH_Code
authorcamjan <jcampos004@ikasle.ehu.es>
Tue, 10 Mar 2015 12:19:47 +0000 (13:19 +0100)
committercamjan <jcampos004@ikasle.ehu.es>
Tue, 10 Mar 2015 12:19:47 +0000 (13:19 +0100)
commit4a87acb4bdf85240f1c0024aebddcc6f57da4e99
tree83851f087b0d9140272693ce74a6ac7e0d1d3804
parenteac0e67caf775ec3b56fa3788ee90a08a95ebacf
parent7c07344e6a7261eb01a948c7e1dbb014704f81f7
Merge branch 'master' of https://xp-dev.com/git/RRRRHHHH_Code

Conflicts:
ruralHouses/src/dataAccess/DB4oManager.java
ruralHouses/src/dataAccess/DB4oManager.java