diff options
| author | Dmitry Jemerov <yole@jetbrains.com> | 2015-01-12 17:27:41 +0100 |
|---|---|---|
| committer | Dmitry Jemerov <yole@jetbrains.com> | 2015-01-12 17:27:41 +0100 |
| commit | 7158019f4a15c8d78faa888666accf8448aff0d4 (patch) | |
| tree | c212aad1d709b8f62a5aac5f9782eeeaa50d68e0 /test | |
| parent | 49feb9021ca24150257caac4a62af5628f52b6b5 (diff) | |
| parent | 5dbadfe3764b4e4564354f4a5a29d7a521c9b632 (diff) | |
| download | dokka-7158019f4a15c8d78faa888666accf8448aff0d4.tar.gz dokka-7158019f4a15c8d78faa888666accf8448aff0d4.tar.bz2 dokka-7158019f4a15c8d78faa888666accf8448aff0d4.zip | |
Merge branch 'jet' of https://github.com/udalov/dokka into udalov-jet
Conflicts:
src/Kotlin/DocumentationBuilder.kt
test/src/TestAPI.kt
Diffstat (limited to 'test')
| -rw-r--r-- | test/src/TestAPI.kt | 3 |
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 |