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

90a7434d

Commit 90a7434d authored 5 years ago by Dennis Eisold

Downloads
- Plain Diff

Merge branch 'master' into 'master'

GuiController / gui.fxml btnReset (zurücksetzen) angebunden => setzt Tagesschlüssel

See merge request !78

parents 3fefc356 4a00123b

Loading

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/projekt/enigma/GuiController.java 5 additions, 4 deletions

src/main/java/projekt/enigma/GuiController.java
src/main/resources/projekt/enigma/gui.fxml 1 addition, 1 deletion

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

with 6 additions and 5 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