Merge branch 'master' into 'master' (5ffb06fd) · Commits · Jan Schubert / Enigma · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

E

Enigma
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

5ffb06fd

Commit 5ffb06fd authored 5 years ago by Dennis Eisold

Downloads
- Plain Diff

Merge branch 'master' into 'master'

Master

See merge request alfatrainingkurse/java/enigma!137

parents ad63d971 8b591dcc

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/projekt/enigma/App.java 2 additions, 0 deletions

src/main/java/projekt/enigma/App.java
src/main/java/projekt/enigma/GuiController.java 78 additions, 106 deletions

src/main/java/projekt/enigma/GuiController.java
src/main/java/projekt/enigma/model/Codierer.java 1 addition, 14 deletions

src/main/java/projekt/enigma/model/Codierer.java
src/main/java/projekt/enigma/model/Hardware.java 21 additions, 21 deletions

src/main/java/projekt/enigma/model/Hardware.java
src/main/java/projekt/enigma/model/Walze.java 1 addition, 1 deletion

src/main/java/projekt/enigma/model/Walze.java
src/main/java/projekt/enigma/view/ChkBoxGridPane.java 27 additions, 26 deletions

src/main/java/projekt/enigma/view/ChkBoxGridPane.java
src/main/resources/projekt/enigma/gui.fxml 9 additions, 47 deletions

src/main/resources/projekt/enigma/gui.fxml

with 139 additions and 215 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