Merge branch 'master' into idea13

Original commit: 79a9253b74
2013-07-09 19:52:06 +04:00
parent 372ea911a5 9defbe0083
commit 30ce814129
1 changed files with 1 additions and 1 deletions
@@ -134,7 +134,7 @@ public class KotlinBuilderModuleScriptGenerator {
        // is not available on TeamCity. When running on TeamCity, one has to provide extra path to JDK annotations
        String extraAnnotationsPaths = System.getProperty("jps.kotlin.extra.annotation.paths");
        if (extraAnnotationsPaths != null) {
-            String[] paths = extraAnnotationsPaths.split(File.pathSeparator);
+            String[] paths = extraAnnotationsPaths.split(";");
            for (String path : paths) {
                annotationRootFiles.add(new File(path));
            }