Merge branch 'gui' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02 into gui

2024-11-24 22:49:44 +01:00 · 2024-11-19 23:09:44 +01:00 · 2024-11-19 23:09:44 +01:00 · bb9727d54a
commit bb9727d54a
parent 7da8b3e545 b6968df451
6 changed files with 1 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -4,6 +4,7 @@ build
 # VSC
 bin
 .vscode
 # IntelliJ
 *.iml
--- a/Battle.j3o
+++ b/Battle.j3o
--- a/BoatSmall.j3o
+++ b/BoatSmall.j3o
--- a/CV.j3o
+++ b/CV.j3o
--- a/KingGeorgeV.j3o
+++ b/KingGeorgeV.j3o
--- a/Projekte/monopoly/client/src/main/resources/Sound/background.ogg
+++ b/Projekte/monopoly/client/src/main/resources/Sound/background.ogg