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

Merge remote-tracking branch '2OOP/main' into Development

Browse Source 
# Conflicts:
#	.idea/compiler.xml
#	.idea/misc.xml
#	app/src/main/java/org/toop/Main.java
This commit is contained in:
Bas de Jong
2025-10-07 19:40:55 +02:00
parent 6bfa8868bf d5735be2db
commit 16a5b1ce2f
3 changed files with 2 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -76,6 +76,8 @@ dist/
nbdist/
nbactions.xml
nb-configuration.xml
misc.xml
compiler.xml
##############################
## Visual Studio Code