Commits · a9da4b1452f0fd1cf6e0c419e43cd2742467ea2f · AlfaTrainingKurse / Java / Enigma

Dec 04, 2019
- Merge branch 'master' into 'master' · a9da4b14
  Dennis Eisold authored 5 years ago
```
Master

Closes #29 und #25

See merge request !125
```
  a9da4b14
- closes #29 · ffa163fa
  Dennis Eisold authored 5 years ago
  
  ffa163fa
- closes #25 · a7a16052
  Dennis Eisold authored 5 years ago
  
  a7a16052
- Merge branch 'master' into 'master' · 299d6070
  Dennis Eisold authored 5 years ago
```
GuiController Steckbrett ToggleButtonGroup

See merge request !124
```
  299d6070
- GuiController Steckbrett ToggleButtonGroup · 1d183447
  Uli Bähr authored 5 years ago
  
  1d183447
- Merge branch 'master' into 'master' · ae395052
  Dennis Eisold authored 5 years ago
```
Doku & Code Conventionen App

See merge request !121
```
  ae395052
- Merge branch 'master' into 'master' · 0d81ccb6
  Dennis Eisold authored 5 years ago
```
Textfelder sind weg, dafür jetzt Buttons

See merge request !122
```
  0d81ccb6
- Textfelder sind weg, dafür jetzt Buttons · 9eaceaeb
  Dennis Eisold authored 5 years ago
  
  9eaceaeb
- Doku & Code Conventionen App · f2a37ab4
  Flori N authored 5 years ago
  
  f2a37ab4
- Merge branch 'master' of https://www.gitrepo.de/alfatrainingkurse/java/enigma · de42cd6d
  Dennis Eisold authored 5 years ago
  
  de42cd6d
- Merge branch 'master' into 'master' · dd56c598
  Dennis Eisold authored 5 years ago
```
Hardware Test Update

See merge request !120
```
  dd56c598
- Hardware Test Update · 9a12ef18
  Dennis Eisold authored 5 years ago
  
  9a12ef18
- Merge remote-tracking branch 'origin/master' · a7f47ed1
  Dennis Eisold authored 5 years ago
  
  a7f47ed1
- Hardware Test Update · 3b2bb40b
  Dennis Eisold authored 5 years ago
  
  3b2bb40b
- Merge branch 'master' into 'master' · ed56d3d2
  Dennis Eisold authored 5 years ago
```
Update der Präsentation

See merge request !119
```
  ed56d3d2
- Merge branch 'master' into 'master' · 1a341cac
  Dennis Eisold authored 5 years ago
```
# Conflicts:
#   Praesentation/praesentation.md
```
  1a341cac
- Merge branch 'master' into 'master' · b10e2c74
  Dennis Eisold authored 5 years ago
```
Master

See merge request !118
```
  b10e2c74
- Merge branch 'master' into 'master' · 152b13ae
  Dennis Eisold authored 5 years ago
```
Master

See merge request !117
```
  152b13ae
- Merge branch 'master' into 'master' · c3834507
  Dennis Eisold authored 5 years ago
```
GuiController SteckbrettButtons added

See merge request !116
```
  c3834507
- Update der Präsentation · 2b5baccf
  Dennis Eisold authored 5 years ago
  
  2b5baccf
- GUI mit port Buttons und Kenngruppen Label · 57006543
  Jan Schubert authored 5 years ago
  
  57006543
- GuiController SteckbrettButtons added · 32eff5e6
  Uli Bähr authored 5 years ago
  
  32eff5e6
- Merge branch 'master' of https://www.gitrepo.de/alfatrainingkurse/java/enigma · 00aabc0c
  Flori N authored 5 years ago
  
  00aabc0c
- Doku & Code Conventionen Fehler, Funkraum, Steckbrett, Main · 71eac38c
  Flori N authored 5 years ago
  
  71eac38c
- GUI mit einem Panel · f83b06d3
  Jan Schubert authored 5 years ago
  
  f83b06d3
- Merge branch 'master' into 'master' · fb3cf17c
  Dennis Eisold authored 5 years ago
```
Kommentare hinzugefuegt

See merge request !115
```
  fb3cf17c
- Merge branch 'master' into 'master' · 25b44684
  Dennis Eisold authored 5 years ago
```
neue Klasse ChkBoxPanel

See merge request !114
```
  25b44684
- Kommentare hinzugefuegt · a94d4517
  Michael authored 5 years ago
  
  a94d4517
- neue Klasse ChkBoxPanel · c153a494
  Uli Bähr authored 5 years ago
  
  c153a494
- Merge branch 'master' into 'master' · dcfe6fe1
  Dennis Eisold authored 5 years ago
```
GuiController / neue Klasse ChkBoxPanel

See merge request !113
```
  dcfe6fe1
- GuiController / neue Klasse ChkBoxPanel · 115f3bad
  Uli Bähr authored 5 years ago
  
  115f3bad
- Merge branch 'master' into 'master' · 296616db
  Dennis Eisold authored 5 years ago
```
1. GUI angepasst

See merge request alfatrainingkurse/java/enigma!112
```
  296616db
- 1. GUI angepasst · 6bc48541
  Jan Schubert authored 5 years ago
  
  6bc48541
- Merge branch 'master' into 'master' · 3a9710fe
  Dennis Eisold authored 5 years ago
```
Master

See merge request !111
```
  3a9710fe
- Update praesentation.md · 560529fa
  Dennis Eisold authored 5 years ago
  
  560529fa
- GUI mit Steckbrett Panes · 76773e49
  Jan Schubert authored 5 years ago
  
  76773e49
- Merge branch 'master' into 'master' · 3fa3f5ad
  Dennis Eisold authored 5 years ago
```
Master

See merge request alfatrainingkurse/java/enigma!109
```
  3fa3f5ad
- Merge branch 'd.eisold-master-patch-72715' into 'master' · 234ee578
  Dennis Eisold authored 5 years ago
```
Aktualisieren Praesentation/praesentation.md

See merge request !110
```
  234ee578
- Aktualisieren Praesentation/praesentation.md · 6c21c73c
  Dennis Eisold authored 5 years ago
  
  6c21c73c
- Merge branch 'master' of https://www.gitrepo.de/alfatrainingkurse/java/enigma · 5b97e38d
  Jan Schubert authored 5 years ago
  
  5b97e38d