diff options
author | Daniel <danielallendeutsch@gmail.com> | 2016-08-31 22:15:47 -0600 |
---|---|---|
committer | Daniel <danielallendeutsch@gmail.com> | 2016-08-31 22:15:47 -0600 |
commit | dbac9f495469854fb64a424b171235e46161d799 (patch) | |
tree | 8c1b5d5b6e287fdedc5092383333b2ddb44bc4f4 /.gitignore | |
parent | 8019a074cfe39e2bf04c35bb5fb40c9ff9cda9a4 (diff) | |
parent | e28d151a8a1d458f3c18897c6095decc17b0c3a1 (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 8c85d6ffa8..07bbf13db1 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ CMakeLists.txt .settings/ .idea .browse.VC.db* +*.stackdump |