aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorDmitry Jemerov <yole@jetbrains.com>2015-01-12 17:30:20 +0100
committerDmitry Jemerov <yole@jetbrains.com>2015-01-12 17:30:20 +0100
commit370b3913e2c629073af91bf9f63be917de2cc6d1 (patch)
tree738b61ef94ccdecc19f9baea2a0b37b273aa3f01 /.gitignore
parent0c584d0e12f07946fdfc8cc0e9f132558ff794fc (diff)
parent75e1f85d92d1a0485983103dd61c46447068c20f (diff)
downloaddokka-370b3913e2c629073af91bf9f63be917de2cc6d1.tar.gz
dokka-370b3913e2c629073af91bf9f63be917de2cc6d1.tar.bz2
dokka-370b3913e2c629073af91bf9f63be917de2cc6d1.zip
Merge branch 'master' into enum-members
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 278ea8d1..182d9c77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
+/.idea/workspace.xml
out
doc