Merge module 'serialization.jvm' into 'descriptor.loader.java'

It was very small and there proved to be no point in separation of loading Java classes and deserializing Kotlin classes
2015-03-23 20:21:38 +03:00
parent b57e15f3a4
commit 085bc2197b
21 changed files with 50 additions and 83 deletions
@@ -56,7 +56,6 @@
                                    <fileset dir="${basedir}/../../../core/descriptors.runtime/src"/>
                                    <fileset dir="${basedir}/../../../core/reflection.jvm/src"/>
                                    <fileset dir="${basedir}/../../../core/serialization/src"/>
-                                    <fileset dir="${basedir}/../../../core/serialization.jvm/src"/>
                                    <fileset dir="${basedir}/../../../core/util.runtime/src"/>
                                </copy>
                            </target>