Merge remote-tracking branch 'upstream/master'

13 files changed, 72 insertions, 31 deletions

diff --git a/Global/Calabash.gitignore b/Global/Calabash.gitignore
new file mode 100644
index 00000000..8a75b329
--- /dev/null
+++ b/Global/Calabash.gitignore
@@ -0,0 +1,10 @@
+# Calabash / Cucumber
+rerun/
+reports/
+screenshots/
+screenshot*.png
+test-servers/
+
+# bundler
+.bundle
+vendor
diff --git a/Global/Eclipse.gitignore b/Global/Eclipse.gitignore
index 0e22e957..53236b63 100644
--- a/Global/Eclipse.gitignore
+++ b/Global/Eclipse.gitignore
@@ -1,6 +1,5 @@
-*.pydevproject
+
 .metadata
-.gradle
 bin/
 tmp/
 *.tmp
@@ -20,7 +19,10 @@ local.properties
 # Locally stored "Eclipse launch configurations"
 *.launch
 
-# CDT-specific
+# PyDev specific (Python IDE for Eclipse)
+*.pydevproject
+
+# CDT-specific (C/C++ Development Tooling)
 .cproject
 
 # JDT-specific (Eclipse Java Development Tools)
@@ -29,11 +31,20 @@ local.properties
 # Java annotation processor (APT)
 .factorypath
 
-# PDT-specific
+# PDT-specific (PHP Development Tools)
 .buildpath
 
 # sbteclipse plugin
 .target
 
+# Tern plugin
+.tern-project
+
 # TeXlipse plugin
 .texlipse
+
+# STS (Spring Tool Suite)
+.springBeans
+
+# Code Recommenders
+.recommenders/
diff --git a/Global/EiffelStudio.gitignore b/Global/EiffelStudio.gitignore
index a7ba35f8..f41b4f70 100644
--- a/Global/EiffelStudio.gitignore
+++ b/Global/EiffelStudio.gitignore
@@ -1,2 +1,2 @@
-# The compilation directoy
+# The compilation directory
 EIFGENs
diff --git a/Global/Emacs.gitignore b/Global/Emacs.gitignore
index f4e7fe79..43632ff1 100644
--- a/Global/Emacs.gitignore
+++ b/Global/Emacs.gitignore
@@ -33,3 +33,6 @@ tramp
 
 # Flycheck
 flycheck_*.el
+
+# server auth directory
+/server/
diff --git a/Global/JetBrains.gitignore b/Global/JetBrains.gitignore
index 177bc80b..b9ed92cb 100644
--- a/Global/JetBrains.gitignore
+++ b/Global/JetBrains.gitignore
@@ -1,33 +1,28 @@
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio
-
-*.iml
-
-## Directory-based project format:
-.idea/
-# if you remove the above rule, at least ignore the following:
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
 # User-specific stuff:
-# .idea/workspace.xml
-# .idea/tasks.xml
-# .idea/dictionaries
-# .idea/shelf
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/dictionaries
+.idea/vcs.xml
+.idea/jsLibraryMappings.xml
 
 # Sensitive or high-churn files:
-# .idea/dataSources.ids
-# .idea/dataSources.xml
-# .idea/sqlDataSources.xml
-# .idea/dynamic.xml
-# .idea/uiDesigner.xml
+.idea/dataSources.ids
+.idea/dataSources.xml
+.idea/sqlDataSources.xml
+.idea/dynamic.xml
+.idea/uiDesigner.xml
 
 # Gradle:
-# .idea/gradle.xml
-# .idea/libraries
+.idea/gradle.xml
+.idea/libraries
 
 # Mongo Explorer plugin:
-# .idea/mongoSettings.xml
+.idea/mongoSettings.xml
 
 ## File-based project format:
-*.ipr
 *.iws
 
 ## Plugin-specific files:
diff --git a/Global/Linux.gitignore b/Global/Linux.gitignore
index 5932ea17..cc958689 100644
--- a/Global/Linux.gitignore
+++ b/Global/Linux.gitignore
@@ -1,5 +1,8 @@
 *~
 
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
 # KDE directory preferences
 .directory
 
diff --git a/Global/Matlab.gitignore b/Global/Matlab.gitignore
index 79bc56cd..32a5ad4c 100644
--- a/Global/Matlab.gitignore
+++ b/Global/Matlab.gitignore
@@ -14,3 +14,6 @@
 
 # Simulink Code Generation
 slprj/
+
+# Session info
+octave-workspace
diff --git a/Global/MicrosoftOffice.gitignore b/Global/MicrosoftOffice.gitignore
index 412297bb..4a2edc7e 100644
--- a/Global/MicrosoftOffice.gitignore
+++ b/Global/MicrosoftOffice.gitignore
@@ -8,3 +8,6 @@
 
 # Excel Backup File
 *.xlk
+
+# PowerPoint temporary
+~$*.ppt*
diff --git a/Global/NetBeans.gitignore b/Global/NetBeans.gitignore
index debe0e48..520d91ff 100644
--- a/Global/NetBeans.gitignore
+++ b/Global/NetBeans.gitignore
@@ -4,5 +4,4 @@ nbbuild/
 dist/
 nbdist/
 nbactions.xml
-nb-configuration.xml
 .nb-gradle/
diff --git a/Global/Vim.gitignore b/Global/Vim.gitignore
index 6c5ee8df..1099aaab 100644
--- a/Global/Vim.gitignore
+++ b/Global/Vim.gitignore
@@ -1,6 +1,8 @@
+# swap
 [._]*.s[a-w][a-z]
 [._]s[a-w][a-z]
-*.un~
+# session
 Session.vim
+# temporary
 .netrwhist
 *~
diff --git a/Global/VirtualEnv.gitignore b/Global/VirtualEnv.gitignore
index 831cf3af..b2c22f2a 100644
--- a/Global/VirtualEnv.gitignore
+++ b/Global/VirtualEnv.gitignore
@@ -4,7 +4,9 @@
 [Bb]in
 [Ii]nclude
 [Ll]ib
+[Ll]ib64
 [Ll]ocal
 [Ss]cripts
 pyvenv.cfg
+.venv
 pip-selfcheck.json
diff --git a/Global/Xcode.gitignore b/Global/Xcode.gitignore
index d07b7894..37de8bb4 100644
--- a/Global/Xcode.gitignore
+++ b/Global/Xcode.gitignore
@@ -4,7 +4,7 @@
 
 ## Build generated
 build/
-DerivedData
+DerivedData/
 
 ## Various settings
 *.pbxuser
@@ -15,9 +15,9 @@ DerivedData
 !default.mode2v3
 *.perspectivev3
 !default.perspectivev3
-xcuserdata
+xcuserdata/
 
 ## Other
-*.xccheckout
 *.moved-aside
-*.xcuserstate
+*.xccheckout
+*.xcscmblueprint
diff --git a/Global/XilinxISE.gitignore b/Global/XilinxISE.gitignore
index e041f51b..4475f843 100644
--- a/Global/XilinxISE.gitignore
+++ b/Global/XilinxISE.gitignore
@@ -42,6 +42,16 @@
 *_usage.xml
 *_xst.xrpt
 
+# iMPACT generated files
+_impactbatch.log
+impact.xsl
+impact_impact.xwbt
+ise_impact.cmd
+webtalk_impact.xml
+
+# Core Generator generated files
+xaw2verilog.log
+
 # project-wide generated files
 *.gise
 par_usage_statistics.html