Merge remote-tracking branch 'upstream/master' into patch-1

23 files changed, 148 insertions, 23 deletions

diff --git a/Global/Eclipse.gitignore b/Global/Eclipse.gitignore
index 4a6cfc7c..6229f7cf 100644
--- a/Global/Eclipse.gitignore
+++ b/Global/Eclipse.gitignore
@@ -1,6 +1,5 @@
-*.pydevproject
+
 .metadata
-.gradle
 bin/
 tmp/
 *.tmp
@@ -11,16 +10,28 @@ local.properties
 .settings/
 .loadpath
 
+# Eclipse Core
+.project
+
 # External tool builders
 .externalToolBuilders/
 
 # Locally stored "Eclipse launch configurations"
 *.launch
 
-# CDT-specific
+# PyDev specific (Python IDE for Eclipse)
+*.pydevproject
+
+# CDT-specific (C/C++ Development Tooling)
 .cproject
 
-# PDT-specific
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
+
+# Java annotation processor (APT)
+.factorypath
+
+# PDT-specific (PHP Development Tools)
 .buildpath
 
 # sbteclipse plugin
@@ -28,3 +39,6 @@ local.properties
 
 # TeXlipse plugin
 .texlipse
+
+# STS (Spring Tool Suite)
+.springBeans
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/Ensime.gitignore b/Global/Ensime.gitignore
index 3772bdfe..f2daebb9 100644
--- a/Global/Ensime.gitignore
+++ b/Global/Ensime.gitignore
@@ -1,3 +1,4 @@
 # Ensime specific
 .ensime
+.ensime_cache/
 .ensime_lucene/
diff --git a/Global/GPG.gitignore b/Global/GPG.gitignore
new file mode 100644
index 00000000..7740a015
--- /dev/null
+++ b/Global/GPG.gitignore
@@ -0,0 +1,2 @@
+secring.*
+
diff --git a/Global/JDeveloper.gitignore b/Global/JDeveloper.gitignore
index 25cbbfe4..5bba6f37 100644
--- a/Global/JDeveloper.gitignore
+++ b/Global/JDeveloper.gitignore
@@ -1,4 +1,13 @@
+# default application storage directory used by the IDE Performance Cache feature
 .data/
+
+# used for ADF styles caching
 temp/
+
+# default output directories
 classes/
+deploy/
+javadoc/
+
+# lock file, a part of Oracle Credential Store Framework
 cwallet.sso.lck
\ No newline at end of file
diff --git a/Global/JetBrains.gitignore b/Global/JetBrains.gitignore
index 0481a342..5d2e327f 100644
--- a/Global/JetBrains.gitignore
+++ b/Global/JetBrains.gitignore
@@ -1,4 +1,4 @@
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
 
 *.iml
 
@@ -10,6 +10,7 @@
 # .idea/workspace.xml
 # .idea/tasks.xml
 # .idea/dictionaries
+# .idea/shelf
 
 # Sensitive or high-churn files:
 # .idea/dataSources.ids
@@ -32,7 +33,7 @@
 ## Plugin-specific files:
 
 # IntelliJ
-out/
+/out/
 
 # mpeltonen/sbt-idea plugin
 .idea_modules/
@@ -44,3 +45,4 @@ atlassian-ide-plugin.xml
 com_crashlytics_export_strings.xml
 crashlytics.properties
 crashlytics-build.properties
+fabric.properties
diff --git a/Global/Lazarus.gitignore b/Global/Lazarus.gitignore
index 3ef747d7..b32943f1 100644
--- a/Global/Lazarus.gitignore
+++ b/Global/Lazarus.gitignore
@@ -1,15 +1,30 @@
-#ignore backup files
-backup/
-
-#ignore files generated by the compiler
-lib/
+# Lazarus compiler-generated binaries (safe to delete)
+*.exe
+*.dll
+*.so
+*.dylib
+*.lrs
+*.res
 *.compiled
+*.dbg
+*.ppu
 *.o
 *.or
-*.ppu
+*.a
 
-#ignore debug information files
-*.dbg
+# Lazarus autogenerated files (duplicated info)
+*.rst
+*.rsj
+*.lrt
 
-#exclude executable output in windows
-*.exe
+# Lazarus local files (user-specific info)
+*.lps
+
+# Lazarus backups and unit output folders.
+# These can be changed by user in Lazarus/project options.
+backup/
+*.bak
+lib/
+
+# Application bundle for Mac OS
+*.app/
diff --git a/Global/Linux.gitignore b/Global/Linux.gitignore
index 9911632b..cc958689 100644
--- a/Global/Linux.gitignore
+++ b/Global/Linux.gitignore
@@ -1,4 +1,10 @@
 *~
 
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
 # KDE directory preferences
 .directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
diff --git a/Global/Mercurial.gitignore b/Global/Mercurial.gitignore
index 3173e26f..e65d1137 100644
--- a/Global/Mercurial.gitignore
+++ b/Global/Mercurial.gitignore
@@ -1,3 +1,6 @@
-/.hg/*
-*/.hg/*
+.hg/
 .hgignore
+.hgsigs
+.hgsub
+.hgsubstate
+.hgtags
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 ab680a8b..520d91ff 100644
--- a/Global/NetBeans.gitignore
+++ b/Global/NetBeans.gitignore
@@ -4,4 +4,4 @@ nbbuild/
 dist/
 nbdist/
 nbactions.xml
-nb-configuration.xml
+.nb-gradle/
diff --git a/Global/OSX.gitignore b/Global/OSX.gitignore
index 5e410368..660b3135 100644
--- a/Global/OSX.gitignore
+++ b/Global/OSX.gitignore
@@ -8,9 +8,13 @@ Icon
 # Thumbnails
 ._*
 
-# Files that might appear on external disk
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
 .Spotlight-V100
+.TemporaryItems
 .Trashes
+.VolumeIcon.icns
 
 # Directories potentially created on remote AFP share
 .AppleDB
diff --git a/Global/Otto.gitignore b/Global/Otto.gitignore
new file mode 100644
index 00000000..5aa263f9
--- /dev/null
+++ b/Global/Otto.gitignore
@@ -0,0 +1 @@
+.otto/
diff --git a/Global/README.md b/Global/README.md
index adc1099c..06b6649b 100644
--- a/Global/README.md
+++ b/Global/README.md
@@ -4,7 +4,7 @@ This directory contains globally useful gitignores,
 e.g. OS-specific and editor specific.
 
 For more on global gitignores:
-<http://help.github.com/git-ignore/>
+<https://help.github.com/articles/ignoring-files/#create-a-global-gitignore>
 
 And a good blog post about 'em:
 <http://augustl.com/blog/2009/global_gitignores>
diff --git a/Global/Redis.gitignore b/Global/Redis.gitignore
new file mode 100644
index 00000000..57c1c230
--- /dev/null
+++ b/Global/Redis.gitignore
@@ -0,0 +1,3 @@
+# Ignore redis binary dump (dump.rdb) files
+
+*.rdb
diff --git a/Global/SynopsysVCS.gitignore b/Global/SynopsysVCS.gitignore
new file mode 100644
index 00000000..eed2432f
--- /dev/null
+++ b/Global/SynopsysVCS.gitignore
@@ -0,0 +1,36 @@
+# Waveform formats
+*.vcd
+*.vpd
+*.evcd
+*.fsdb
+
+# Default name of the simulation executable.  A different name can be 
+# specified with this switch (the associated daidir database name is 
+# also taken from here):  -o <path>/<filename>
+simv
+
+# Generated for Verilog and VHDL top configs
+simv.daidir/
+simv.db.dir/
+
+# Infrastructure necessary to co-simulate SystemC models with 
+# Verilog/VHDL models.  An alternate directory may be specified with this
+# switch:  -Mdir=<directory_path>
+csrc/
+
+# Log file - the following switch allows to specify the file that will be
+# used to write all messages from simulation:  -l <filename>
+*.log
+
+# Coverage results (generated with urg) and database location.  The 
+# following switch can also be used:  urg -dir <coverage_directory>.vdb
+simv.vdb/
+urgReport/
+
+# DVE and UCLI related files.
+DVEfiles/
+ucli.key
+
+# When the design is elaborated for DirectC, the following file is created
+# with declarations for C/C++ functions.
+vc_hdrs.h
diff --git a/Global/Tags.gitignore b/Global/Tags.gitignore
index 45922ec1..c0318165 100644
--- a/Global/Tags.gitignore
+++ b/Global/Tags.gitignore
@@ -1,7 +1,9 @@
 # Ignore tags created by etags, ctags, gtags (GNU global) and cscope
 TAGS
+.TAGS
 !TAGS/
 tags
+.tags
 !tags/
 gtags.files
 GTAGS
diff --git a/Global/vim.gitignore b/Global/Vim.gitignore
index 6c5ee8df..6c5ee8df 100644
--- a/Global/vim.gitignore
+++ b/Global/Vim.gitignore
diff --git a/Global/VirtualEnv.gitignore b/Global/VirtualEnv.gitignore
index 043786df..b2c22f2a 100644
--- a/Global/VirtualEnv.gitignore
+++ b/Global/VirtualEnv.gitignore
@@ -4,6 +4,9 @@
 [Bb]in
 [Ii]nclude
 [Ll]ib
+[Ll]ib64
+[Ll]ocal
 [Ss]cripts
 pyvenv.cfg
 .venv
+pip-selfcheck.json
diff --git a/Global/VisualStudioCode.gitignore b/Global/VisualStudioCode.gitignore
new file mode 100644
index 00000000..faa18382
--- /dev/null
+++ b/Global/VisualStudioCode.gitignore
@@ -0,0 +1,2 @@
+.vscode
+
diff --git a/Global/webMethods.gitignore b/Global/WebMethods.gitignore
index b383c25c..b383c25c 100644
--- a/Global/webMethods.gitignore
+++ b/Global/WebMethods.gitignore
diff --git a/Global/Xcode.gitignore b/Global/Xcode.gitignore
index 1b81d249..d07b7894 100644
--- a/Global/Xcode.gitignore
+++ b/Global/Xcode.gitignore
@@ -1,4 +1,12 @@
+# Xcode
+#
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## Build generated
 build/
+DerivedData
+
+## Various settings
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -8,7 +16,8 @@ build/
 *.perspectivev3
 !default.perspectivev3
 xcuserdata
+
+## Other
 *.xccheckout
 *.moved-aside
-DerivedData
 *.xcuserstate
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