diff options
author | Joshua T <joshua@sonofone.net> | 2016-07-26 01:49:24 -0500 |
---|---|---|
committer | Joshua T <joshua@sonofone.net> | 2016-07-26 01:49:24 -0500 |
commit | 5607b716ba0ec7002f29244f24aa8999b9511061 (patch) | |
tree | bdd1255faa369d1e9bf1959d96b25ed857916ff5 /.gitignore | |
parent | 876a6bdd4ca9033972d0a2d8c0c563cc6d7d9e7e (diff) | |
parent | f9aadd17e8fce17fe1e135cf8022e71a35ae5adf (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 7c1e434e31..8491433524 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ CMakeLists.txt .project .settings/ .idea +.browse.VC.db*
\ No newline at end of file |