Merge branch 'JetBrains:master' into patch-1

JetBrains · Nov 28, 2024 · 757f4bb · 757f4bb
2 parents 1b40667 + b7886a4
commit 757f4bb
Show file tree

Hide file tree

Showing 24,242 changed files with 528,495 additions and 444,027 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,6 +1,7 @@
 **/testData/** linguist-vendored
 *Generated.java linguist-generated=true
 *.kt.txt linguist-language=Kotlin
+*.klib_abi.txt linguist-language=Kotlin
 * text=auto
 * eol=lf
 *.png binary

diff --git a/.idea/inspectionProfiles/idea_default.xml b/.idea/inspectionProfiles/idea_default.xml
diff --git a/.idea/kotlinTestDataPluginTestDataPaths.xml b/.idea/kotlinTestDataPluginTestDataPaths.xml
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/.idea/runConfigurations/Analysis_API_Dump.xml b/.idea/runConfigurations/Analysis_API_Dump.xml
diff --git a/.idea/runConfigurations/Generate_Compiler_Configuration_Keys.xml b/.idea/runConfigurations/Generate_Compiler_Configuration_Keys.xml