Merge branch 'master' into 'master' (3fd73239) · Commits · Uli Bähr / 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

3fd73239

Commit 3fd73239 authored 5 years ago by Dennis Eisold

Downloads
- Plain Diff

Merge branch 'master' into 'master'

# Conflicts:
#   src/main/java/Enigma/model/DatenbankSqlite.java

parents 572dda57 d621df68

Loading

Pipeline #189 failed with stages

in 1 minute and 54 seconds

Changes 12
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/Enigma/App.java 90 additions, 17 deletions

src/main/java/Enigma/App.java
src/main/java/Enigma/model/Codebuch.java 77 additions, 44 deletions

src/main/java/Enigma/model/Codebuch.java
src/main/java/Enigma/model/DatenbankSqlite.java 25 additions, 14 deletions

src/main/java/Enigma/model/DatenbankSqlite.java
src/main/java/Enigma/model/Funkraum.java 0 additions, 1 deletion

src/main/java/Enigma/model/Funkraum.java
src/main/java/Enigma/model/Hardware.java 227 additions, 0 deletions

src/main/java/Enigma/model/Hardware.java
src/main/java/Enigma/model/Morsecode.java 0 additions, 1 deletion

src/main/java/Enigma/model/Morsecode.java
src/main/java/Enigma/model/Walze.java 220 additions, 227 deletions

src/main/java/Enigma/model/Walze.java
src/test/java/Enigma/model/CodebuchTest.java 1 addition, 3 deletions

src/test/java/Enigma/model/CodebuchTest.java
src/test/java/Enigma/model/HardwareTest.java 62 additions, 0 deletions

src/test/java/Enigma/model/HardwareTest.java
src/test/java/Enigma/model/ReflektorTest.java 0 additions, 10 deletions

src/test/java/Enigma/model/ReflektorTest.java
src/test/java/Enigma/model/SteckbrettTest.java 4 additions, 15 deletions

src/test/java/Enigma/model/SteckbrettTest.java
src/test/java/Enigma/model/WalzeTest.java 15 additions, 17 deletions

src/test/java/Enigma/model/WalzeTest.java

with 721 additions and 349 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