Merge branch 'master' of https://www.gitrepo.de/alfatrainingkurse/java/enigma (888518f0) · 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

888518f0

Commit 888518f0 authored 5 years ago by Flori N

Downloads
- Plain Diff

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

 Conflicts:
	src/main/java/projekt/enigma/model/Walze.java

parents 0ce8f17f 6e7e6c92

Loading

Changes 4

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/projekt/enigma/GuiController.java 38 additions, 39 deletions

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

src/main/java/projekt/enigma/model/Codierer.java
src/main/resources/projekt/enigma/gui.fxml 530 additions, 306 deletions

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

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

with 592 additions and 359 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