mirror of
https://github.com/2OOP/pism.git
synced 2026-02-04 02:44:50 +00:00
2c8db95ba7
# Conflicts: # app/src/main/java/org/toop/app/App.java # app/src/main/java/org/toop/app/canvas/GameCanvas.java # app/src/main/java/org/toop/app/layer/layers/MainLayer.java # app/src/main/java/org/toop/app/layer/layers/OptionsPopup.java # app/src/main/java/org/toop/app/layer/layers/game/TicTacToeLayer.java # app/src/main/java/org/toop/local/AppSettings.java # app/src/main/resources/assets/localization/localization_ar.properties # app/src/main/resources/assets/localization/localization_de.properties # app/src/main/resources/assets/localization/localization_en.properties # app/src/main/resources/assets/localization/localization_es.properties # app/src/main/resources/assets/localization/localization_fr.properties # app/src/main/resources/assets/localization/localization_hi.properties # app/src/main/resources/assets/localization/localization_it.properties # app/src/main/resources/assets/localization/localization_ja.properties # app/src/main/resources/assets/localization/localization_ko.properties # app/src/main/resources/assets/localization/localization_nl.properties # app/src/main/resources/assets/localization/localization_ru.properties # app/src/main/resources/assets/localization/localization_zh.properties
PISM, pis with maven.
