aboutsummaryrefslogtreecommitdiff
path: root/src/Analysis/CommentsAPI.kt
diff options
context:
space:
mode:
authorDmitry Jemerov <yole@jetbrains.com>2015-01-12 17:30:20 +0100
committerDmitry Jemerov <yole@jetbrains.com>2015-01-12 17:30:20 +0100
commit370b3913e2c629073af91bf9f63be917de2cc6d1 (patch)
tree738b61ef94ccdecc19f9baea2a0b37b273aa3f01 /src/Analysis/CommentsAPI.kt
parent0c584d0e12f07946fdfc8cc0e9f132558ff794fc (diff)
parent75e1f85d92d1a0485983103dd61c46447068c20f (diff)
downloaddokka-370b3913e2c629073af91bf9f63be917de2cc6d1.tar.gz
dokka-370b3913e2c629073af91bf9f63be917de2cc6d1.tar.bz2
dokka-370b3913e2c629073af91bf9f63be917de2cc6d1.zip
Merge branch 'master' into enum-members
Diffstat (limited to 'src/Analysis/CommentsAPI.kt')
-rw-r--r--src/Analysis/CommentsAPI.kt7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/Analysis/CommentsAPI.kt b/src/Analysis/CommentsAPI.kt
index b195107a..ce453113 100644
--- a/src/Analysis/CommentsAPI.kt
+++ b/src/Analysis/CommentsAPI.kt
@@ -1,9 +1,8 @@
package org.jetbrains.dokka
-import org.jetbrains.jet.lang.descriptors.*
-import org.jetbrains.jet.lang.resolve.*
-import org.jetbrains.jet.kdoc.psi.api.*
-import org.jetbrains.jet.lang.psi.*
+import org.jetbrains.kotlin.descriptors.*
+import org.jetbrains.kotlin.resolve.*
+import org.jetbrains.kotlin.kdoc.psi.api.*
/**
* Retrieves PSI elements representing documentation from the [DeclarationDescriptor]