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 /.gitignore | |
| 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 '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -1,2 +1,3 @@ +/.idea/workspace.xml out doc |