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
1dfa6a7c6edc28617effa9b5305b7d9b2800ccb6
pism/app
History
ramollia 1dfa6a7c6e Merge remote-tracking branch 'origin/Development' into Development 
# Conflicts:
#	app/src/main/java/org/toop/app/App.java
#	app/src/main/java/org/toop/app/canvas/ReversiCanvas.java
#	app/src/main/java/org/toop/app/game/ReversiGame.java
#	app/src/main/java/org/toop/app/game/TicTacToeGame.java
#	app/src/main/java/org/toop/app/view/displays/SongDisplay.java
#	app/src/main/java/org/toop/local/AppContext.java
2025-11-27 17:28:12 +01:00
..
src/main
Merge remote-tracking branch 'origin/Development' into Development
2025-11-27 17:28:12 +01:00
pom.xml
Changed pom to be correct.
2025-10-13 02:06:12 +02:00