aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorDmitry Jemerov <yole@jetbrains.com>2015-01-12 17:28:11 +0100
committerDmitry Jemerov <yole@jetbrains.com>2015-01-12 17:28:11 +0100
commit75e1f85d92d1a0485983103dd61c46447068c20f (patch)
treec212aad1d709b8f62a5aac5f9782eeeaa50d68e0 /test
parent49feb9021ca24150257caac4a62af5628f52b6b5 (diff)
parent7158019f4a15c8d78faa888666accf8448aff0d4 (diff)
downloaddokka-75e1f85d92d1a0485983103dd61c46447068c20f.tar.gz
dokka-75e1f85d92d1a0485983103dd61c46447068c20f.tar.bz2
dokka-75e1f85d92d1a0485983103dd61c46447068c20f.zip
Merge branch 'udalov-jet'
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