Simon Wilkening fd178eee43 Merge remote-tracking branch 'origin/gui' into gui ...

# Conflicts:
#	Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/popups/ConfirmTrade.java

2024-11-29 07:16:21 +01:00

..

client

Merge remote-tracking branch 'origin/gui' into gui

2024-11-29 07:16:21 +01:00

model

fixed some mistakes

2024-11-29 07:11:20 +01:00

server

rudimentary function for trade

2024-11-29 03:07:17 +01:00

run-mac.sh

init for monopoly

2024-11-12 14:53:04 +01:00

run.sh

init for monopoly

2024-11-12 14:53:04 +01:00