Merge branch 'master' into 'master' (7f82f754) · Commits · Flori N / 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

7f82f754

Commit 7f82f754 authored 5 years ago by Dennis Eisold

Downloads
- Plain Diff

Merge branch 'master' into 'master'

Master

See merge request alfatrainingkurse/java/enigma!85

parents a9565240 73b9f074

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/projekt/enigma/App.java 66 additions, 0 deletions

src/main/java/projekt/enigma/App.java
src/main/java/projekt/enigma/KenngruppeController.java 21 additions, 38 deletions

src/main/java/projekt/enigma/KenngruppeController.java
src/main/resources/projekt/enigma/gui.fxml 30 additions, 20 deletions

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

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

with 118 additions and 59 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