diff options
author | Dmitry Jemerov <yole@jetbrains.com> | 2015-01-14 20:25:08 +0100 |
---|---|---|
committer | Dmitry Jemerov <yole@jetbrains.com> | 2015-01-14 20:25:08 +0100 |
commit | 77c1f53cab3c2b143a3dafaf6c7bef49df5bcdb9 (patch) | |
tree | 76faf3713906bfa45c8aa8199b60935e0f5bb0b7 /src/Model | |
parent | cfc0348e120df881461ada2d3299f0fb4314f49e (diff) | |
parent | fac6872053a009dc083b2f0e487db0b94103d221 (diff) | |
download | dokka-77c1f53cab3c2b143a3dafaf6c7bef49df5bcdb9.tar.gz dokka-77c1f53cab3c2b143a3dafaf6c7bef49df5bcdb9.tar.bz2 dokka-77c1f53cab3c2b143a3dafaf6c7bef49df5bcdb9.zip |
Merge branch 'source-links'
Conflicts:
src/Kotlin/DocumentationBuilder.kt
Diffstat (limited to 'src/Model')
-rw-r--r-- | src/Model/DocumentationNode.kt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/Model/DocumentationNode.kt b/src/Model/DocumentationNode.kt index 6e707cce..a666b486 100644 --- a/src/Model/DocumentationNode.kt +++ b/src/Model/DocumentationNode.kt @@ -97,6 +97,8 @@ public open class DocumentationNode(val name: String, Annotation Value + + SourceUrl } } |