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

4aaa75c0

Commit 4aaa75c0 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 20a93240 79db1cc2

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/Enigma/GuiController.java 109 additions, 200 deletions

src/main/java/Enigma/GuiController.java
src/main/java/Enigma/Main.java 0 additions, 3 deletions

src/main/java/Enigma/Main.java
src/main/java/Enigma/model/Reflektor.java 11 additions, 43 deletions

src/main/java/Enigma/model/Reflektor.java
src/main/java/Enigma/model/Steckbrett.java 77 additions, 0 deletions

src/main/java/Enigma/model/Steckbrett.java
src/main/java/Enigma/model/Walze.java 146 additions, 119 deletions

src/main/java/Enigma/model/Walze.java
src/main/resources/Enigma/gui.fxml 40 additions, 46 deletions

src/main/resources/Enigma/gui.fxml

with 383 additions and 411 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