stef_buwalda/pism
1
0
Fork 0
mirror of https://github.com/2OOP/pism.git synced 2026-02-04 10:54:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
09f3dc4e3e9e71da7a8affeb9aa103c4bb4da987
pism/app
History
lieght 6ae5f1c2d2 Merge remote-tracking branch 'origin/UI' into UI 
# Conflicts:
#	app/src/main/java/org/toop/app/App.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:33 +02:00
..
src/main
Merge remote-tracking branch 'origin/UI' into UI
2025-10-15 21:05:33 +02:00
pom.xml
Changed pom to be correct.
2025-10-13 02:06:12 +02:00