mirror of
https://github.com/2OOP/pism.git
synced 2026-02-04 10:54:51 +00:00
0a6c2487bd
# Conflicts: # app/src/main/java/org/toop/app/App.java # app/src/main/java/org/toop/app/GameInformation.java # app/src/main/java/org/toop/app/canvas/GameCanvas.java # app/src/main/java/org/toop/app/canvas/TicTacToeCanvas.java # app/src/main/java/org/toop/app/layer/Container.java # app/src/main/java/org/toop/app/layer/Layer.java # app/src/main/java/org/toop/app/layer/NodeBuilder.java # app/src/main/java/org/toop/app/layer/Popup.java # app/src/main/java/org/toop/app/layer/containers/HorizontalContainer.java # app/src/main/java/org/toop/app/layer/containers/VerticalContainer.java # app/src/main/java/org/toop/app/layer/layers/ConnectedLayer.java # app/src/main/java/org/toop/app/layer/layers/CreditsPopup.java # app/src/main/java/org/toop/app/layer/layers/MainLayer.java # app/src/main/java/org/toop/app/layer/layers/MultiplayerLayer.java # app/src/main/java/org/toop/app/layer/layers/OptionsPopup.java # app/src/main/java/org/toop/app/layer/layers/QuitPopup.java # app/src/main/java/org/toop/app/layer/layers/game/GameFinishedPopup.java # app/src/main/java/org/toop/app/layer/layers/game/TicTacToeLayer.java # app/src/main/java/org/toop/local/AppSettings.java
PISM, pis with maven.
