stef_buwalda/pism - pism - Gitea: Git with a cup of tea

mirror of https://github.com/2OOP/pism.git synced 2026-02-04 10:54:51 +00:00

Go to file

lieght b30420616a Merge remote-tracking branch 'origin/185-networkingeventlistener' into UI

# Conflicts:
#	app/src/main/java/org/toop/app/App.java
#	app/src/main/java/org/toop/app/layer/layers/ConnectedLayer.java
#	app/src/main/java/org/toop/app/layer/layers/MainLayer.java
#	app/src/main/java/org/toop/app/layer/layers/OptionsPopup.java
#	app/src/main/java/org/toop/app/layer/layers/game/TicTacToeLayer.java
#	app/src/main/java/org/toop/local/AppSettings.java

2025-10-15 21:05:01 +02:00