Merge branch 'master' into 'master' (6430264f) · 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

6430264f

Commit 6430264f authored 5 years ago by Dennis Eisold

Downloads
- Plain Diff

Merge branch 'master' into 'master'

Master

See merge request alfatrainingkurse/java/enigma!27

parents eaa6b325 f197c6f7

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/Enigma/GuiController.java 90 additions, 3 deletions

src/main/java/Enigma/GuiController.java
src/main/java/Enigma/KenngruppeController.java 2 additions, 2 deletions

src/main/java/Enigma/KenngruppeController.java
src/main/resources/Enigma/gui.fxml 77 additions, 69 deletions

src/main/resources/Enigma/gui.fxml
src/main/resources/Enigma/kenngruppe.fxml 15 additions, 0 deletions

src/main/resources/Enigma/kenngruppe.fxml
src/main/resources/Enigma/secondary.fxml 0 additions, 16 deletions

src/main/resources/Enigma/secondary.fxml

with 184 additions and 90 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