diff options
| author | Dmitry Jemerov <yole@jetbrains.com> | 2015-01-12 17:30:20 +0100 |
|---|---|---|
| committer | Dmitry Jemerov <yole@jetbrains.com> | 2015-01-12 17:30:20 +0100 |
| commit | 370b3913e2c629073af91bf9f63be917de2cc6d1 (patch) | |
| tree | 738b61ef94ccdecc19f9baea2a0b37b273aa3f01 /src/Kotlin/ContentBuilder.kt | |
| parent | 0c584d0e12f07946fdfc8cc0e9f132558ff794fc (diff) | |
| parent | 75e1f85d92d1a0485983103dd61c46447068c20f (diff) | |
| download | dokka-370b3913e2c629073af91bf9f63be917de2cc6d1.tar.gz dokka-370b3913e2c629073af91bf9f63be917de2cc6d1.tar.bz2 dokka-370b3913e2c629073af91bf9f63be917de2cc6d1.zip | |
Merge branch 'master' into enum-members
Diffstat (limited to 'src/Kotlin/ContentBuilder.kt')
| -rw-r--r-- | src/Kotlin/ContentBuilder.kt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Kotlin/ContentBuilder.kt b/src/Kotlin/ContentBuilder.kt index 0143feed..0143a46e 100644 --- a/src/Kotlin/ContentBuilder.kt +++ b/src/Kotlin/ContentBuilder.kt @@ -1,10 +1,10 @@ package org.jetbrains.dokka import java.util.ArrayDeque -import org.jetbrains.jet.lang.descriptors.* -import org.jetbrains.jet.lang.resolve.* -import org.jetbrains.jet.lang.resolve.scopes.* -import org.jetbrains.jet.lang.resolve.name.* +import org.jetbrains.kotlin.descriptors.* +import org.jetbrains.kotlin.resolve.* +import org.jetbrains.kotlin.resolve.scopes.* +import org.jetbrains.kotlin.name.* import org.intellij.markdown.* public fun DocumentationBuilder.buildContent(tree: MarkdownNode, descriptor: DeclarationDescriptor): Content { |