From a03f8f143dc2256f89c8ebed8a7a07a1ba1792e7 Mon Sep 17 00:00:00 2001
From: Timothy Andrew <mail@timothyandrew.net>
Date: Mon, 8 May 2017 09:02:14 +0000
Subject: Update gitignore, dockerfile, and license templates for 9.2.

---
 vendor/gitignore/Global/Archives.gitignore        |  1 +
 vendor/gitignore/Global/JetBrains.gitignore       |  3 +++
 vendor/gitignore/Global/MicrosoftOffice.gitignore |  2 +-
 vendor/gitignore/Magento.gitignore                | 27 +++++++++++++++++++++++
 vendor/gitignore/Python.gitignore                 |  4 ++++
 vendor/gitignore/Qt.gitignore                     |  1 +
 vendor/gitignore/UnrealEngine.gitignore           |  5 +++++
 7 files changed, 42 insertions(+), 1 deletion(-)

(limited to 'vendor/gitignore')

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*
diff --git a/vendor/gitignore/Magento.gitignore b/vendor/gitignore/Magento.gitignore
index b282f5cf547..6f1fa223992 100644
--- a/vendor/gitignore/Magento.gitignore
+++ b/vendor/gitignore/Magento.gitignore
@@ -3,14 +3,41 @@
 #--------------------------#
 
 /app/etc/local.xml
+
 /media/*
 !/media/.htaccess
+
+!/media/customer
+/media/customer/*
 !/media/customer/.htaccess
+
+!/media/dhl
+/media/dhl/*
 !/media/dhl/logo.jpg
+
+!/media/downloadable
+/media/downloadable/*
 !/media/downloadable/.htaccess
+
+!/media/xmlconnect
+/media/xmlconnect/*
+
+!/media/xmlconnect/custom
+/media/xmlconnect/custom/*
 !/media/xmlconnect/custom/ok.gif
+
+!/media/xmlconnect/original
+/media/xmlconnect/original/*
 !/media/xmlconnect/original/ok.gif
+
+!/media/xmlconnect/system
+/media/xmlconnect/system/*
 !/media/xmlconnect/system/ok.gif
+
 /var/*
 !/var/.htaccess
+
+!/var/package
+/var/package/*
 !/var/package/*.xml
+
diff --git a/vendor/gitignore/Python.gitignore b/vendor/gitignore/Python.gitignore
index ff65a437185..768d5f400bb 100644
--- a/vendor/gitignore/Python.gitignore
+++ b/vendor/gitignore/Python.gitignore
@@ -89,9 +89,13 @@ ENV/
 
 # Spyder project settings
 .spyderproject
+.spyproject
 
 # Rope project settings
 .ropeproject
 
 # mkdocs documentation
 /site
+
+# mypy
+.mypy_cache/
diff --git a/vendor/gitignore/Qt.gitignore b/vendor/gitignore/Qt.gitignore
index c7659c24f38..6732e72091c 100644
--- a/vendor/gitignore/Qt.gitignore
+++ b/vendor/gitignore/Qt.gitignore
@@ -20,6 +20,7 @@
 *.qbs.user.*
 *.moc
 moc_*.cpp
+moc_*.h
 qrc_*.cpp
 ui_*.h
 Makefile*
diff --git a/vendor/gitignore/UnrealEngine.gitignore b/vendor/gitignore/UnrealEngine.gitignore
index 2f096001fec..6c6e1c327fd 100644
--- a/vendor/gitignore/UnrealEngine.gitignore
+++ b/vendor/gitignore/UnrealEngine.gitignore
@@ -54,6 +54,11 @@ Binaries/*
 # Builds
 Build/*
 
+# Whitelist PakBlacklist-<BuildConfiguration>.txt files
+!Build/*/
+Build/*/**
+!Build/*/PakBlacklist*.txt
+
 # Don't ignore icon files in Build
 !Build/**/*.ico
 
-- 
cgit v1.2.3