Merge remote-tracking branch 'origin/master' into idea14

Conflicts: update_dependencies.xml
2014-06-27 14:44:05 +04:00
parent 6095faed14 46da00a9a7
commit e7a1cba1eb
252 changed files with 1663 additions and 1096 deletions
@@ -139,7 +139,7 @@

        <echo file="${kotlin-home}/build.txt" message="${build.number}"/>

-        <chmod dir="${kotlin-home}/bin" includes="*" perm="755"/>
+        <chmod dir="${kotlin-home}/bin" excludes="**/*.bat" perm="755"/>
    </target>

    <target name="compilerSources">