mirror of
https://github.com/2OOP/pism.git
synced 2026-02-04 02:44:50 +00:00
6626157052
# Conflicts: # app/src/main/java/org/toop/app/App.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/QuitMenu.java # app/src/main/resources/assets/image/background.jpg # app/src/main/resources/assets/image/battleship.png # app/src/main/resources/assets/image/icon.png # app/src/main/resources/assets/image/lowpoly.png # app/src/main/resources/assets/image/other.png # app/src/main/resources/assets/image/reversi.png # app/src/main/resources/assets/image/sudoku.png # app/src/main/resources/assets/image/tictactoe.png # app/src/main/resources/assets/style/app.css # app/src/main/resources/assets/style/main.css # app/src/main/resources/assets/style/quit.css # app/src/main/resources/assets/style/style.css
PISM, pis with maven.
