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
f7803095725753f924038c6df39763e5207f1b4c
pism/app/src
History
ramollia f780309572 Merge remote-tracking branch 'origin/Settings' into UI 
# Conflicts:
#	app/src/main/java/org/toop/app/App.java
#	app/src/main/java/org/toop/app/layer/layers/OptionsLayer.java
#	framework/src/main/java/org/toop/framework/audio/SoundManager.java
2025-10-05 17:03:09 +02:00
..
main
Merge remote-tracking branch 'origin/Settings' into UI
2025-10-05 17:03:09 +02:00