aboutsummaryrefslogtreecommitdiff
path: root/test
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 /test
parent0c584d0e12f07946fdfc8cc0e9f132558ff794fc (diff)
parent75e1f85d92d1a0485983103dd61c46447068c20f (diff)
downloaddokka-370b3913e2c629073af91bf9f63be917de2cc6d1.tar.gz
dokka-370b3913e2c629073af91bf9f63be917de2cc6d1.tar.bz2
dokka-370b3913e2c629073af91bf9f63be917de2cc6d1.zip
Merge branch 'master' into enum-members
Diffstat (limited to 'test')
-rw-r--r--test/src/TestAPI.kt3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/src/TestAPI.kt b/test/src/TestAPI.kt
index e559e337..901e78fc 100644
--- a/test/src/TestAPI.kt
+++ b/test/src/TestAPI.kt
@@ -1,9 +1,10 @@
package org.jetbrains.dokka.tests
-import org.jetbrains.jet.cli.common.messages.*
+import org.jetbrains.kotlin.cli.common.messages.*
import com.intellij.openapi.util.*
import kotlin.test.fail
import org.jetbrains.dokka.*
+import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
import java.io.File
import com.intellij.openapi.application.PathManager
import org.junit.Assert