github
/
compose-jb
mirror of https://gitee.com/github-sync-mirror/compose-jb.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Merge branch 'release/1.6.1' into igor.demin/merge-1.6.1-1 

# 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.kt
igor.demin/merge-1.6.1-1
Igor Demin 3 months ago
parent
33482890a4 ea161426f2
commit
c39041a7fd
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File

Diff Content Not Available