Commit 4a4559b
committed
Merge remote-tracking branch 'origin/master'
# Conflicts:
# .idea/gradle.xml
# .idea/jarRepositories.xml
# .idea/libraries/Gradle__graphics_scenery_spirvcrossj_0_6_0_1_1_106_0.xml
# .idea/libraries/Gradle__graphics_scenery_spirvcrossj_natives_windows_0_6_0_1_1_106_0.xml
# .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_reflect_1_3_72.xml
# .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_3_71.xml
# .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk8_modular_1_3_72.xml
# .idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_1_3_5.xml
# .idea/libraries/Gradle__org_junit_platform_junit_platform_commons_1_6_1.xml
# .idea/libraries/Gradle__org_junit_platform_junit_platform_engine_1_6_1.xml
# .idea/libraries/Gradle__org_junit_platform_junit_platform_launcher_1_6_1.xml
# .idea/libraries/Gradle__org_junit_platform_junit_platform_suite_api_1_6_1.xml
# .idea/libraries/Gradle__org_lwjgl_lwjgl_3_2_3.xml
# .idea/libraries/Gradle__org_lwjgl_lwjgl_glfw_3_2_3.xml
# .idea/libraries/Gradle__org_lwjgl_lwjgl_glfw_natives_linux_3_2_3.xml
# .idea/libraries/Gradle__org_lwjgl_lwjgl_glfw_natives_windows_3_2_3.xml
# .idea/libraries/Gradle__org_lwjgl_lwjgl_jemalloc_3_2_3.xml
# .idea/libraries/Gradle__org_lwjgl_lwjgl_jemalloc_natives_linux_3_2_3.xml
# .idea/libraries/Gradle__org_lwjgl_lwjgl_natives_linux_3_2_3.xml
# .idea/libraries/Gradle__org_lwjgl_lwjgl_natives_windows_3_2_3.xml
# .idea/libraries/Gradle__org_lwjgl_lwjgl_openal_3_2_3.xml
# .idea/libraries/Gradle__org_lwjgl_lwjgl_openal_natives_linux_3_2_3.xml
# .idea/libraries/Gradle__org_lwjgl_lwjgl_opengl_3_2_3.xml
# .idea/libraries/Gradle__org_lwjgl_lwjgl_opengl_natives_linux_3_2_3.xml
# .idea/libraries/Gradle__org_lwjgl_lwjgl_stb_3_2_3.xml
# .idea/libraries/Gradle__org_lwjgl_lwjgl_stb_natives_linux_3_2_3.xml
# .idea/libraries/Gradle__org_lwjgl_lwjgl_vulkan_3_2_3.xml
# .idea/misc.xml
# .idea/modules/vkk.main.iml
# .idea/modules/vkk.test.iml
# build.gradle.kts
# gradle/wrapper/gradle-wrapper.properties
# src/main/java/module-info.java
# src/main/kotlin/vkk/vk.kt
# src/test/kotlin/tests/06 initDepthBuffer.kt
# vkk.imlFile tree
52 files changed
+548
-3
lines changed- .idea/libraries
- src/test/kotlin/tests
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
52 files changed
+548
-3
lines changedSome generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
0 commit comments