diff options
author | Toni <jeder@mail1a.de> | 2016-07-25 12:49:38 +0200 |
---|---|---|
committer | Toni <jeder@mail1a.de> | 2016-07-25 12:49:38 +0200 |
commit | 5e2e8c89e86fbabb65737789ff0545e3e8ac1610 (patch) | |
tree | ce13a00ccc10fdc147a0e8caa0c2a1bbabfda357 /.gitignore | |
parent | 5631f1436c356fb9e09138f186981dc9b6cb43a2 (diff) | |
parent | 8b94e26d7c3b30cc57d710a11e5651d15e8e3b20 (diff) |
Merge remote-tracking branch 'origin/master' into iso_split_rshift
whatever
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 |