summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authortgrogers <[email protected]>2018-04-11 15:43:49 -0400
committertgrogers <[email protected]>2018-04-11 15:43:49 -0400
commit35eb8dfa699df3bd5526d8d659ffd754d54880cc (patch)
treebf65659a4cf398d450dc8d9127377d642219319e /.gitignore
parent913c8934d89068ea96729b238a42879d2e02e7f4 (diff)
parent2221d208a745a098a60b0d24c05007e92aaba092 (diff)
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore4
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 53fadb5..887b605 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ libcuda/cuobjdump_parser.h
libcuda/cuobjdump_parser.output
lib/*
+doc/doxygen/html
cuobjdump_to_ptxplus/elf_lexer.cc
cuobjdump_to_ptxplus/elf_parser.cc
@@ -26,4 +27,5 @@ cuobjdump_to_ptxplus/sass_parser.cc
cuobjdump_to_ptxplus/sass_parser.hh
cuobjdump_to_ptxplus/sass_parser.output
-build/* \ No newline at end of file
+build/*
+*.swp