RRRRHHHH_Code
Changeset 8bf31b380026a40c5ba48495b862a73377460de0
Committed by epinzolas001 on Fri 27 Feb, 2015 12:08:52 +0000
Commit Message:
Merge branch ‘master’ of https://xp-dev.com/git/RRRRHHHH_Code
Conflicts:
ruralHouses/db/DBjcampos004.yap
ruralHouses/src/gui/IntroduceOfferGUI.java
Changes
Modified ruralHouses/.gitignore Diff
Modified ruralHouses/db/DBjcampos004.yap Diff
Modified ruralHouses/src/configuration/Config.java Diff
Modified ruralHouses/src/gui/IntroduceOfferGUI.java Diff
Modified ruralHouses/src/gui/StartWindow.java Diff