diff options
| author | Joshua T <joshua@sonofone.net> | 2016-08-07 23:28:59 -0500 |
|---|---|---|
| committer | Joshua T <joshua@sonofone.net> | 2016-08-07 23:28:59 -0500 |
| commit | 6df31120a1904ee1330787701d4bcb84c4c72390 (patch) | |
| tree | b0fb3ccd691c17240442271f12c5af2ba9843295 /.gitignore | |
| parent | cf795a6f93a541c2ff5d64daa0aefd1f97d62035 (diff) | |
| parent | 213cb2c24306e198e717fc162806201567666f36 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 8491433524..8c85d6ffa8 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,7 @@ build/ .build/ *.bak .vagrant/ +quantum/version.h .idea/ CMakeLists.txt .DS_STORE @@ -26,4 +27,4 @@ CMakeLists.txt .project .settings/ .idea -.browse.VC.db*
\ No newline at end of file +.browse.VC.db* |