summaryrefslogtreecommitdiff
path: root/test/scaladoc/.gitignore
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@gmail.com>2016-06-19 14:12:13 +0200
committerLukas Rytz <lukas.rytz@gmail.com>2016-06-21 11:23:03 +0200
commite4c2d68fcf2aebe062faf2bdad08e07704b66d9a (patch)
tree5e1ba660b36a285e50652883bca96e7514fe592b /test/scaladoc/.gitignore
parentb3283669e05dc706274e944ffd3750892c16e4dd (diff)
parentaaf7bc0b948ee073934885f8240193a4ba2b3bb8 (diff)
downloadscala-e4c2d68fcf2aebe062faf2bdad08e07704b66d9a.tar.gz
scala-e4c2d68fcf2aebe062faf2bdad08e07704b66d9a.tar.bz2
scala-e4c2d68fcf2aebe062faf2bdad08e07704b66d9a.zip
Merge commit 'aaf7bc0' into merge-2.11-to-2.12-june-19
Diffstat (limited to 'test/scaladoc/.gitignore')
-rw-r--r--test/scaladoc/.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/test/scaladoc/.gitignore b/test/scaladoc/.gitignore
new file mode 100644
index 0000000000..161be5b55f
--- /dev/null
+++ b/test/scaladoc/.gitignore
@@ -0,0 +1,2 @@
+*.log
+*.obj/