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
5ff7bdc0bdddb5a7c2d6d3b69bcba723988d9936
pism/app/src/main
History
lieght 5ff7bdc0bd Merge remote-tracking branch 'origin/Alpha' into UI 
# Conflicts:
#	.idea/misc.xml
#	app/src/main/java/org/toop/app/App.java
#	app/src/main/java/org/toop/app/menu/CreditsMenu.java
#	app/src/main/java/org/toop/app/menu/MainMenu.java
#	app/src/main/java/org/toop/app/menu/Menu.java
#	app/src/main/java/org/toop/app/menu/OptionsMenu.java
#	app/src/main/java/org/toop/app/menu/QuitMenu.java
#	app/src/main/resources/assets/style/main.css
#	app/src/main/resources/assets/style/quit.css
2025-10-01 18:12:36 +02:00
..
java/org/toop
Docs and easy font loading. Added interfaces for PreloadResource's
2025-10-01 18:09:14 +02:00
resources
Merge remote-tracking branch 'origin/Alpha' into UI
2025-10-01 18:12:36 +02:00