diff --git a/.idea/artifacts/KotlinJpsPlugin.xml b/.idea/artifacts/KotlinJpsPlugin.xml
index b65083fffc6..4ce89a4c583 100644
--- a/.idea/artifacts/KotlinJpsPlugin.xml
+++ b/.idea/artifacts/KotlinJpsPlugin.xml
@@ -12,7 +12,7 @@
-
+
\ No newline at end of file
diff --git a/.idea/artifacts/KotlinPlugin.xml b/.idea/artifacts/KotlinPlugin.xml
index 482d04c2737..0da513aceab 100644
--- a/.idea/artifacts/KotlinPlugin.xml
+++ b/.idea/artifacts/KotlinPlugin.xml
@@ -30,7 +30,7 @@
-
+
diff --git a/build.xml b/build.xml
index 957f399bd5e..3bafbfe2c53 100644
--- a/build.xml
+++ b/build.xml
@@ -1,7 +1,7 @@
-
+
@@ -385,7 +385,7 @@
-
+
diff --git a/compiler/util/src/org/jetbrains/jet/utils/LibraryUtils.kt b/compiler/util/src/org/jetbrains/jet/utils/LibraryUtils.kt
index 7c3320a1dad..fb36a71a280 100644
--- a/compiler/util/src/org/jetbrains/jet/utils/LibraryUtils.kt
+++ b/compiler/util/src/org/jetbrains/jet/utils/LibraryUtils.kt
@@ -47,7 +47,7 @@ public object LibraryUtils {
var jsStdLib = ""
var jsLib = ""
- val manifestProperties = javaClass().getResourceAsStream("/manifest.properties")
+ val manifestProperties = javaClass().getResourceAsStream("/kotlinManifest.properties")
if (manifestProperties != null) {
try {
val properties = Properties()
@@ -61,7 +61,7 @@ public object LibraryUtils {
}
else {
- LOG.error("Resource 'manifest.properties' not found.")
+ LOG.error("Resource 'kotlinManifest.properties' not found.")
}
TITLE_KOTLIN_JAVASCRIPT_STDLIB = jsStdLib
diff --git a/libraries/examples/kotlin-js-library-example/pom.xml b/libraries/examples/kotlin-js-library-example/pom.xml
index cdfeda6421c..1fa16546f01 100644
--- a/libraries/examples/kotlin-js-library-example/pom.xml
+++ b/libraries/examples/kotlin-js-library-example/pom.xml
@@ -46,7 +46,7 @@
- ../../../resources/manifest.properties
+ ../../../resources/kotlinManifest.properties
diff --git a/resources/manifest.properties b/resources/kotlinManifest.properties
similarity index 100%
rename from resources/manifest.properties
rename to resources/kotlinManifest.properties