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
This commit is contained in:
Alexander Udalov
2015-03-23 20:21:38 +03:00
parent b57e15f3a4
commit 085bc2197b
21 changed files with 50 additions and 83 deletions
@@ -7,9 +7,8 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="serialization" />
<orderEntry type="module" module-name="serialization.jvm" />
<orderEntry type="library" name="javax.inject" level="project" />
<orderEntry type="module" module-name="serialization" />
<orderEntry type="module" module-name="util.runtime" />
</component>
</module>