Merge remote-tracking branch 'origin/dev' into dev
# Conflicts: # app/src/main/java/de/uni_hannover/swt/tic_tac_toe/Main.java # app/src/test/java/de/uni_hannover/swt/tic_tac_toe/AppTest.java
Showing
- app/build.gradle 0 additions, 36 deletionsapp/build.gradle
- app/src/main/java/de/uni_hannover/swt/tic_tac_toe/Main.java 0 additions, 14 deletionsapp/src/main/java/de/uni_hannover/swt/tic_tac_toe/Main.java
- app/src/test/java/de/uni_hannover/swt/tic_tac_toe/AppTest.java 0 additions, 14 deletions...rc/test/java/de/uni_hannover/swt/tic_tac_toe/AppTest.java
- build.gradle 57 additions, 0 deletionsbuild.gradle
- gradle.properties 0 additions, 5 deletionsgradle.properties
- gradle/libs.versions.toml 0 additions, 10 deletionsgradle/libs.versions.toml
- gradle/wrapper/gradle-wrapper.jar 0 additions, 0 deletionsgradle/wrapper/gradle-wrapper.jar
- gradle/wrapper/gradle-wrapper.properties 1 addition, 3 deletionsgradle/wrapper/gradle-wrapper.properties
- gradlew 13 additions, 31 deletionsgradlew
- gradlew.bat 16 additions, 21 deletionsgradlew.bat
- settings.gradle 1 addition, 14 deletionssettings.gradle
- src/main/java/de/uni_hannover/swt/tictactoe/HelloApplication.java 23 additions, 0 deletions.../java/de/uni_hannover/swt/tictactoe/HelloApplication.java
- src/main/java/de/uni_hannover/swt/tictactoe/HelloController.java 14 additions, 0 deletions...n/java/de/uni_hannover/swt/tictactoe/HelloController.java
- src/main/java/module-info.java 8 additions, 0 deletionssrc/main/java/module-info.java
- src/main/resources/de/uni_hannover/swt/tictactoe/hello-view.fxml 16 additions, 0 deletions...n/resources/de/uni_hannover/swt/tictactoe/hello-view.fxml
Loading
Please register or sign in to comment