Browse Source
# Conflicts: # gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/resources/ResourcesGenerator.kt # gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/resources/ResourcesSpec.kt # gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/ResourcesTest.kt # gradle-plugins/compose/src/test/test-projects/misc/commonResources/expected/Drawable0.kt # gradle-plugins/compose/src/test/test-projects/misc/commonResources/expected/Font0.kt # gradle-plugins/compose/src/test/test-projects/misc/commonResources/expected/String0.kt # gradle-plugins/compose/src/test/test-projects/misc/hugeResources/build.gradle.kts # gradle-plugins/compose/src/test/test-projects/misc/hugeResources/expected/Drawable0.kt # gradle-plugins/compose/src/test/test-projects/misc/hugeResources/expected/Drawable1.kt # gradle-plugins/compose/src/test/test-projects/misc/hugeResources/expected/Drawable2.kt # gradle-plugins/compose/src/test/test-projects/misc/hugeResources/expected/String0.kt # gradle-plugins/compose/src/test/test-projects/misc/hugeResources/expected/String1.kt # gradle-plugins/compose/src/test/test-projects/misc/hugeResources/expected/String2.kt # gradle-plugins/compose/src/test/test-projects/misc/hugeResources/src/commonMain/kotlin/App.kt # gradle-plugins/compose/src/test/test-projects/misc/jvmOnlyResources/expected/Drawable0.ktpull/3199/merge
Igor Demin
10 months ago