Merge branch 'master' into 'master' (25007267) · Commits · Dennis Eisold / 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

25007267

Commit 25007267 authored 5 years ago by Dennis Eisold

Downloads
- Plain Diff

Merge branch 'master' into 'master'

Fehlermeldung bei 250 Zeichen

See merge request !145

parents cc996d30 c4fed854

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/projekt/enigma/GuiController.java 4 additions, 1 deletion

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

src/main/java/projekt/enigma/model/Walze.java
src/main/resources/projekt/enigma/gui.fxml 24 additions, 12 deletions

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

with 29 additions and 14 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