stef_buwalda/pism
1
0
Fork 0
mirror of https://github.com/2OOP/pism.git synced 2026-02-04 02:44:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
a5513bf87bf096638034fbc44f6325cd3ca820a4
pism/app
History
lieght a5513bf87b Merge remote-tracking branch 'origin/121-settings-menu' into UI 
# Conflicts:
#	app/src/main/java/org/toop/app/menu/OptionsMenu.java
#	app/src/main/resources/assets/localization/localization_de.properties
#	app/src/main/resources/assets/localization/localization_en_US.properties
#	app/src/main/resources/assets/localization/localization_es.properties
#	app/src/main/resources/assets/localization/localization_fr.properties
#	app/src/main/resources/assets/localization/localization_it.properties
#	app/src/main/resources/assets/localization/localization_nl.properties
#	app/src/main/resources/assets/localization/localization_zh.properties
2025-10-03 03:25:20 +02:00
..
src/main
Merge remote-tracking branch 'origin/121-settings-menu' into UI
2025-10-03 03:25:20 +02:00
pom.xml
Pom fixes
2025-10-02 22:07:51 +02:00