Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

BudgetMaster
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

e8ae4cd9

Unverified Commit e8ae4cd9 authored 7 years ago by Robert Goldmann Committed by GitHub 7 years ago

Downloads
- Plain Diff

Merge pull request #228 from deadlocker8/v1_7_1

merge v1_7_1 into master

parents 39594048 1dc14e65

Branches

Tags v1.7.1

No related merge requests found

Changes 11

Show whitespace changes

Inline Side-by-side

Showing

BudgetMasterClient/pom.xml 1 addition, 1 deletion

BudgetMasterClient/pom.xml
BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/SettingsController.java 15 additions, 19 deletions

.../budgetmasterclient/ui/controller/SettingsController.java
BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_de.properties 3 additions, 3 deletions

...rces/de/deadlocker8/budgetmaster/languages/_de.properties
BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_en.properties 3 additions, 3 deletions

...rces/de/deadlocker8/budgetmaster/languages/_en.properties
BudgetMasterCore/src/main/java/de/deadlocker8/budgetmaster/logic/Settings.java 3 additions, 3 deletions

...main/java/de/deadlocker8/budgetmaster/logic/Settings.java
BudgetMasterCore/src/main/java/de/deadlocker8/budgetmaster/logic/utils/FileHelper.java 1 addition, 1 deletion

...a/de/deadlocker8/budgetmaster/logic/utils/FileHelper.java
BudgetMasterServer/.classpath 1 addition, 1 deletion

BudgetMasterServer/.classpath
BudgetMasterServer/pom.xml 1 addition, 1 deletion

BudgetMasterServer/pom.xml
build/BudgetMaster.exe 0 additions, 0 deletions

build/BudgetMaster.exe
build/BudgetMasterClient.jar 0 additions, 0 deletions

build/BudgetMasterClient.jar
build/BudgetMasterServer.jar 0 additions, 0 deletions

build/BudgetMasterServer.jar

with 28 additions and 32 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment