about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2015-06-13 00:35:30 +0100
committerJames Booth <boothj5@gmail.com>2015-06-13 00:35:30 +0100
commit718967e90d7a3e406dda454a2abe80fee258226a (patch)
tree4b65eac7a984a92eb21e10680497f709124715b8
parentc2c2cee6c9cdeb91b276775c2d11367fb2c95deb (diff)
parent362c1d81ae9a975355e16133eb99ed2bee320858 (diff)
downloadprofani-tty-718967e90d7a3e406dda454a2abe80fee258226a.tar.gz
Merge branch 'master' into openpgp
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index c62b5575..fbf0a3fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@
 profanity.mk
 profanity.project
 profanity.workspace
+compile_commands.json
 
 # autotools
 .libs/