diff options
| author | KrystianUjma <kujma@virtuslab.com> | 2019-05-28 11:51:33 +0200 |
|---|---|---|
| committer | KrystianUjma <kujma@virtuslab.com> | 2019-05-28 11:51:33 +0200 |
| commit | 218e7b9bd9b40c7216755f20f5a604b4c37b75d7 (patch) | |
| tree | 555a4d92f02c95d8c59177645b157b80433d5a47 /.idea/encodings.xml | |
| parent | 6dedccb91b4bb3018b32159551b3862fedb7f230 (diff) | |
| parent | ec2dfa898b4cf2613ca15cd959a43f4f590005d3 (diff) | |
| download | dokka-218e7b9bd9b40c7216755f20f5a604b4c37b75d7.tar.gz dokka-218e7b9bd9b40c7216755f20f5a604b4c37b75d7.tar.bz2 dokka-218e7b9bd9b40c7216755f20f5a604b4c37b75d7.zip | |
Merge branch 'dev' of git://github.com/Xerus2000/dokka into Xerus2000-dev
update .gitignore and .idea
# Conflicts:
# .idea/compiler.xml
# .idea/kotlinc.xml
# .idea/modules.xml
# core/src/main/kotlin/Java/JavaPsiDocumentationBuilder.kt
# core/src/main/kotlin/Java/JavadocParser.kt
# core/src/main/kotlin/Kotlin/DeclarationLinkResolver.kt
# core/src/main/kotlin/Kotlin/DocumentationBuilder.kt
# core/src/main/kotlin/Model/DocumentationReference.kt
# core/src/main/kotlin/Model/PackageDocs.kt
# core/src/main/kotlin/Model/SourceLinks.kt
# core/src/main/kotlin/Utilities/DokkaModules.kt
# core/src/main/kotlin/Utilities/ServiceLocator.kt
# core/src/main/kotlin/javadoc/docbase.kt
# core/src/test/kotlin/format/HtmlFormatTest.kt
# core/src/test/kotlin/format/KotlinWebSiteFormatTest.kt
# core/src/test/kotlin/format/KotlinWebSiteHtmlFormatTest.kt
# core/src/test/kotlin/format/KotlinWebSiteRunnableSamplesFormatTest.kt
# core/src/test/kotlin/issues/IssuesTest.kt
Diffstat (limited to '.idea/encodings.xml')
| -rw-r--r-- | .idea/encodings.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 00000000..97626ba4 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="Encoding"> + <file url="PROJECT" charset="UTF-8" /> + </component> +</project>
\ No newline at end of file |