RRRRHHHH_Code
Changeset ba6020dbbdae8fddc57edd4723eb0b3a4a530e14
Committed by camjan on Wed 15 Apr, 2015 15:47:17 +0000
Commit Message:
Merge branch ‘master’ of https://xp-dev.com/git/RRRRHHHH_Code
Conflicts:
ruralHouses/src/dataAccess/DB4oManager.java
ruralHouses/src/gui/ModifyHouseGUI.java
Changes
Modified ruralHouses/src/businessLogic/LoginManager.java Diff
Modified ruralHouses/src/businessLogic/LoginManagerInterface.java Diff
Modified ruralHouses/src/dataAccess/DB4oManager.java Diff
Modified ruralHouses/src/domain/Account.java Diff
Modified ruralHouses/src/domain/Administrator.java Diff
Modified ruralHouses/src/gui/AdminMenuGUI.java Diff
Modified ruralHouses/src/gui/LoginGUI.java Diff
Modified ruralHouses/src/gui/ModifyHouseGUI.java Diff
Modified ruralHouses/src/gui/StartWindow.java Diff
Modified ruralHouses/src/gui/listOfAdditionRequestsGUI.java Diff
Modified ruralHouses/src/gui/listOfRemovalRequestsGUI.java Diff