Merge upstream changes

18 files changed, 119 insertions, 35 deletions

diff --git a/Global/Eclipse.gitignore b/Global/Eclipse.gitignore
index 81e44304..29a336c2 100644
--- a/Global/Eclipse.gitignore
+++ b/Global/Eclipse.gitignore
@@ -1,6 +1,5 @@
-*.pydevproject
+
 .metadata
-.gradle
 bin/
 tmp/
 *.tmp
@@ -20,17 +19,29 @@ 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)
 .classpath
 
-# PDT-specific
+# Java annotation processor (APT)
+.factorypath
+
+# PDT-specific (PHP Development Tools)
 .buildpath
 
 # sbteclipse plugin
 .target
 
+# Tern plugin
+.tern-project
+
 # 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/Emacs.gitignore b/Global/Emacs.gitignore
index e5327bad..95e09eba 100644
--- a/Global/Emacs.gitignore
+++ b/Global/Emacs.gitignore
@@ -30,3 +30,6 @@ tramp
 
 # cask packages
 .cask/
+
+# server auth directory
+/server/
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/JetBrains.gitignore b/Global/JetBrains.gitignore
index 6b3ea2a7..2947063e 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
 # Reference https://intellij-support.jetbrains.com/entries/23393067
 
 # User-specific stuff:
@@ -38,3 +38,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 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/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 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/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/SynopsysVCS.gitignore b/Global/SynopsysVCS.gitignore
index 97317896..eed2432f 100644
--- a/Global/SynopsysVCS.gitignore
+++ b/Global/SynopsysVCS.gitignore
@@ -1,23 +1,36 @@
-# Waveforms
-*.vpd
+# Waveform formats
 *.vcd
+*.vpd
 *.evcd
+*.fsdb
 
-# Binary files
+# 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
 
-# Directories used for compilation
-csrc/
+# Generated for Verilog and VHDL top configs
 simv.daidir/
+simv.db.dir/
 
-# Log files
-*.log
+# Infrastructure necessary to co-simulate SystemC models with 
+# Verilog/VHDL models.  An alternate directory may be specified with this
+# switch:  -Mdir=<directory_path>
+csrc/
 
-# DVE, UCLI related files
-DVEfiles/
-ucli*
-*.key
+# Log file - the following switch allows to specify the file that will be
+# used to write all messages from simulation:  -l <filename>
+*.log
 
-# Coverage related files
+# 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..325bd576 100644
--- a/Global/Vim.gitignore
+++ b/Global/Vim.gitignore
@@ -1,6 +1,10 @@
+# swap
 [._]*.s[a-w][a-z]
 [._]s[a-w][a-z]
+# persistent undo 
 *.un~
+# session
 Session.vim
+# temporary
 .netrwhist
 *~
diff --git a/Global/VirtualEnv.gitignore b/Global/VirtualEnv.gitignore
index e2c082c8..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/Xcode.gitignore b/Global/Xcode.gitignore
index 1b81d249..37de8bb4 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
@@ -7,8 +15,9 @@ build/
 !default.mode2v3
 *.perspectivev3
 !default.perspectivev3
-xcuserdata
-*.xccheckout
+xcuserdata/
+
+## Other
 *.moved-aside
-DerivedData
-*.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