Skip to content

Commit 28c6381

Browse files
committed
Merge remote-tracking branch 'origin/master'
# Conflicts: # .idea/jarRepositories.xml # .idea/modules/vkk.main.iml # .idea/modules/vkk.test.iml # build.gradle
2 parents 6b6abe7 + 1cb3e1b commit 28c6381

File tree

224 files changed

+3787
-3607
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

224 files changed

+3787
-3607
lines changed

.idea/gradle.xml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Gradle__com_github_kotlin_graphics_glm_glm_1b4ac18dd1a3c23440d3f33596688aac60bc0141.xml

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Gradle__com_github_kotlin_graphics_gln_8dea51af29a2a1d6e51ed3b6d7b06ba2ca2f99b9.xml

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Gradle__com_github_kotlin_graphics_kotlin_unsigned_18131d0fe0b7465a145a4502d31452c5ae0e59a1.xml

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Gradle__com_github_kotlin_graphics_uno_sdk_uno_core_55063f983dba678375a5196ec13e4d716bb474f4.xml

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Gradle__com_github_kotlin_graphics_uno_sdk_uno_gl_55063f983dba678375a5196ec13e4d716bb474f4.xml

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Gradle__com_github_kotlin_graphics_uno_sdk_uno_vk_55063f983dba678375a5196ec13e4d716bb474f4.xml

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Gradle__org_lwjgl_lwjgl_jemalloc_natives_windows_3_2_3.xml

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/libraries/Gradle__org_lwjgl_lwjgl_opengles_3_2_3.xml

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/main/java/module-info.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@
1515
requires kotlin.stdlib.jdk7;
1616

1717
exports vkk;
18-
exports vkk._10.api;
19-
exports vkk._10.structs;
20-
exports vkk._11.api;
21-
exports vkk._11.structs;
18+
exports vkk.vk10.api;
19+
exports vkk.vk10.structs;
20+
exports vkk.vk11.structs;
2221
exports vkk.entities;
2322
exports vkk.extensions;
2423
exports vkk.identifiers;

0 commit comments

Comments
 (0)