mirror of
https://github.com/2OOP/pism.git
synced 2026-02-04 02:44:50 +00:00
1dfa6a7c6e
# 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
PISM, pis with maven.
