diff options
author | Timothy Andrew <mail@timothyandrew.net> | 2017-05-08 12:02:14 +0300 |
---|---|---|
committer | Timothy Andrew <mail@timothyandrew.net> | 2017-05-08 12:02:14 +0300 |
commit | a03f8f143dc2256f89c8ebed8a7a07a1ba1792e7 (patch) | |
tree | 8b18ded4cc99b0605be4ffaeb283331dc538e572 /vendor/gitignore/Global | |
parent | 6386e42f06bb26746a9168a8c81ad03fa0356dbd (diff) |
Update gitignore, dockerfile, and license templates for 9.2.
Diffstat (limited to 'vendor/gitignore/Global')
-rw-r--r-- | vendor/gitignore/Global/Archives.gitignore | 1 | ||||
-rw-r--r-- | vendor/gitignore/Global/JetBrains.gitignore | 3 | ||||
-rw-r--r-- | vendor/gitignore/Global/MicrosoftOffice.gitignore | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/vendor/gitignore/Global/Archives.gitignore b/vendor/gitignore/Global/Archives.gitignore index e9eda68baf2..f440b808d98 100644 --- a/vendor/gitignore/Global/Archives.gitignore +++ b/vendor/gitignore/Global/Archives.gitignore @@ -5,6 +5,7 @@ *.rar *.zip *.gz +*.tgz *.bzip *.bz2 *.xz diff --git a/vendor/gitignore/Global/JetBrains.gitignore b/vendor/gitignore/Global/JetBrains.gitignore index a5d4cc86d33..ff23445e2b0 100644 --- a/vendor/gitignore/Global/JetBrains.gitignore +++ b/vendor/gitignore/Global/JetBrains.gitignore @@ -19,6 +19,9 @@ .idea/**/gradle.xml .idea/**/libraries +# CMake +cmake-build-debug/ + # Mongo Explorer plugin: .idea/**/mongoSettings.xml diff --git a/vendor/gitignore/Global/MicrosoftOffice.gitignore b/vendor/gitignore/Global/MicrosoftOffice.gitignore index cb891745660..0c203662d39 100644 --- a/vendor/gitignore/Global/MicrosoftOffice.gitignore +++ b/vendor/gitignore/Global/MicrosoftOffice.gitignore @@ -13,4 +13,4 @@ ~$*.ppt* # Visio autosave temporary files -*.~vsdx +*.~vsd* |