Git Repository Public Repository

RRRRHHHH_Code

URLs

Copy to Clipboard

Changeset 42679bcd0e79750f8a1ec7c2388cd4d675de58f1

Committed by pinene on Sun 19 Apr, 2015 14:18:02 +0000

Commit Message:

Merge branch ‘master’ of https://xp-dev.com/git/RRRRHHHH_Code

Conflicts:
ruralHouses/src/businessLogic/OfferManager.java
ruralHouses/src/gui/HouseFeaturesGUI.java
ruralHouses/src/gui/ModifyHouseGUI.java
ruralHouses/src/gui/StartWindow.java

Changes