Merge branch 'master' of https://www.gitrepo.de/alfatrainingkurse/java/enigma (703dbd82) · Commits · AlfaTrainingKurse / Java / 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

703dbd82

Commit 703dbd82 authored 5 years ago by Uli Bähr

Downloads
- Plain Diff

Merge branch 'master' of https://www.gitrepo.de/alfatrainingkurse/java/enigma

 Conflicts:
	src/main/java/enigma/GuiController.java

parents 8fd87738 b1defdbc

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/enigma/App.java 1 addition, 0 deletions

src/main/java/enigma/App.java
src/main/java/enigma/GuiController.java 26 additions, 109 deletions

src/main/java/enigma/GuiController.java
src/main/resources/enigma/gui.fxml 36 additions, 31 deletions

src/main/resources/enigma/gui.fxml
src/main/resources/enigma/kenngruppe.fxml 9 additions, 4 deletions

src/main/resources/enigma/kenngruppe.fxml

with 72 additions and 144 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