aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorTor Aamodt <[email protected]>2018-03-28 15:53:59 -0700
committerTor Aamodt <[email protected]>2018-03-28 15:53:59 -0700
commitd0ee86a0d39f9dfa1eba13ea6cca1b1d0e86523b (patch)
treeb64f6bc12df0785271f73ddc805c1e2b05db0f1c /.gitignore
parent7758943c96d22cd65f3de30b36c71b27370de5ce (diff)
parent635366fe3e9b596318647b9c5bcdd546c522d52a (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