summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authordi0ib2016-08-07 20:20:16 -1000
committerdi0ib2016-08-07 20:20:16 -1000
commita36b2a0756761513a9853af78d61e8b666b34aa7 (patch)
treea783cea131f5afe22788809a069b1a365a9c3fba /.gitignore
parent8610481c372e9de02fe1ec7b77a9f3598a72a372 (diff)
parent213cb2c24306e198e717fc162806201567666f36 (diff)
Merge remote-tracking branch 'refs/remotes/jackhumbert/master'
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 7c1e434e3..8c85d6ffa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@ build/
.build/
*.bak
.vagrant/
+quantum/version.h
.idea/
CMakeLists.txt
.DS_STORE
@@ -26,3 +27,4 @@ CMakeLists.txt
.project
.settings/
.idea
+.browse.VC.db*