Diffusion gitignore 29bd7031a7e3

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

Authored by Michiel Sikma <michiel@sikma.org> on Jan 21 2016, 10:36.

Description

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

Details

Committed

Michiel Sikma <michiel@sikma.org>

Jan 21 2016, 10:36

Pushed

aubort

Jul 2 2018, 16:12

Parents

rGITIGNOREe4c0ed3c209b: Merge pull request #1826 from pra85/patch-1
rGITIGNOREc9200696fb23: Update VirtualEnv.gitignore

Branches

Unknown

Tags

Unknown

Event Timeline

Michiel Sikma <michiel@sikma.org> committed rGITIGNORE29bd7031a7e3: Merge remote-tracking branch 'upstream/master' into patch-1 (authored by Michiel Sikma <michiel@sikma.org>).Jan 21 2016, 10:36

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

Commit	Author	Details	Committed
e4c0ed3c209b	Garen Torikian	Merge pull request #1826 from pra85/patch-1	Jan 17 2016
df37ae670c22	Garen Torikian	Merge pull request #1827 from DerNivel/patch-1	Jan 17 2016
cedf149de3ec	Levin Rickert	URL doesn't exists anymore	Jan 17 2016
2cf169922707	Prayag Verma	Update license year to 2016	Jan 16 2016
4215c0f78cf6	Arfon Smith	Merge pull request #1617 from manavm/ipynb-checkpoints	Jan 15 2016
f51f0baa5a72	Brendan Forster	Merge pull request #1812 from AArnott/patch-4	Jan 15 2016
3299a7e4dc23	Brendan Forster	Merge pull request #1819 from adrfer/master	Jan 15 2016
def395f811ed	Brendan Forster	Merge pull request #1824 from mimibar/patch-1	Jan 13 2016
491eca8bda23	mimibar	Comments	Jan 13 2016
da521d7bbf55	Brendan Forster	Merge pull request #1814 from AArnott/patch-6	Jan 12 2016
1c24a55ec3de	Brendan Forster	Merge pull request #1822 from rogierslag/master	Jan 11 2016
7e854d399154	Brendan Forster	Merge pull request #1821 from jelford/master	Jan 11 2016
ce4e9ccd7a71	Rogier Slag	Exclude Latexian temp files for Tex documents	Jan 10 2016
efab0fd13c8b	James Elford	Include lib64 for virtualenv	Jan 10 2016
be3333655bff	Brendan Forster	Merge pull request #1818 from dopefishh/patch-1	Jan 5 2016
578a7b751484	Brendan Forster	Merge pull request #1815 from anderslundsgard/master	Jan 5 2016
33da976da9a6	Adriano Ferreira	Ignore playground.xcworkspace playground file	Jan 3 2016
679c67738234	Adriano Ferreira	Ignore timeline.xctimeline playground file	Jan 3 2016
3e9a2d98e256	dopefishh	Add TeX precompiled preamble and xypic	Jan 3 2016
fceac113a3a2	Brendan Forster	Merge pull request #1629 from raabf/fuse_hidden	Jan 1 2016
b6f1c2f2a0da	Brendan Forster	Merge pull request #1816 from rosolkodv/patch-1	Jan 1 2016
5fa2ff234591	Dmitry Rosolko	Update Eclipse.gitignore	Dec 31 2015
65ba08ced799	Anders Lundsgård	Name update of Windows Azure	Dec 28 2015
a25589c92187	Anders Lundsgård	Ignore Azure ApplicationInsights.config	Dec 28 2015
656f766bfc75	Brendan Forster	Merge pull request #1813 from AArnott/patch-5	Dec 27 2015
849fa552f217	Andrew Arnott	Remove `build/` suppression	Dec 27 2015
346fb93318b0	Andrew Arnott	Stop ignoring StyleCop.json	Dec 27 2015
6d1612cff432	Andrew Arnott	Ignore files generated by NuGet v3 project.json	Dec 27 2015
8c9b77cb5c85	Brendan Forster	Merge pull request #1808 from habi/patch-4	Dec 21 2015
fe3b2f4d97a4	David Haberthür	Ignore auxiliary files from \usepackage{cprotect}	Dec 21 2015
7adc93eed241	Brendan Forster	Merge pull request #1806 from recooper/whitespace-fix	Dec 17 2015
61a76c1c0825	Roland Cooper	Add new line at end of file	Dec 17 2015
a8a9744a6f51	Brendan Forster	Merge pull request #1803 from belyansky/ignore-bundleartifacts	Dec 14 2015
21f95b328020	Alexey Belyansky	Ignore BundleArtifacts folder	Dec 14 2015
7361dcd45a11	Brendan Forster	Merge pull request #1800 from jutaz/bugfix/typos	Dec 13 2015
f5784d7a10fe	Justas Brazauskas	Fix few typos	Dec 13 2015
5ae4b3fd6d9f	Brendan Forster	Merge pull request #1798 from JelteF/patch-1	Dec 13 2015
a32059c07c47	Jelte Fennema	Tex: Ignore files generated by pdfcomment package	Dec 11 2015
a018c720b7c6	Brendan Forster	Merge pull request #1797 from tim-hub/master	Dec 10 2015
5e08bf6060e7	Tim	Unity.gitignore modyfying, add `/[Bb]uilds/ /Assets/AssetStoreTools*`…	Dec 10 2015
e56901553585	Brendan Forster	Merge pull request #1789 from stephengroat/master	Dec 7 2015
bf845507564b	Stephen	Update to include iMPACT and Core Generator files	Dec 6 2015
5c11cc04f05a	Brendan Forster	Merge pull request #1788 from camigreen/joomla-3.4.5	Dec 6 2015
6e1ae4aa6d87	Shawn Gibbons	Updated for Joomla 3.4.5	Dec 5 2015
c7a4ac81812a	Shawn Gibbons	Updated for Joomla 3.4.5	Dec 5 2015
5d98cfd19e3b	Shawn Gibbons	Updated for Joomla 3.4.5	Dec 5 2015
e2b70bd344dd	Brendan Forster	Merge pull request #1785 from natestedman/patch-1	Dec 4 2015
611c239f68c2	Nate Stedman	Add Swift Package Manager to Swift.gitignore	Dec 4 2015
31c8ed982951	Brendan Forster	Merge pull request #1779 from ffsantos92/patch-1	Dec 2 2015
ada61a7f50be	Fábio Santos	Update OpenCart.gitignore	Dec 2 2015

Changes (88)

				Path
	M			Android.gitignore
	A			AppEngine.gitignore
	M			ArchLinuxPackages.gitignore
	M			Autotools.gitignore
	P			C.gitignore Copied to Lua.gitignore
	M			CMake.gitignore
	A			CUDA.gitignore
	M			CakePHP.gitignore
	M			CodeIgniter.gitignore
	M			Composer.gitignore
	P			D.gitignore Copied from C++.gitignore
	M			Dart.gitignore
	M			Delphi.gitignore
	M			Elixir.gitignore
	A			Elm.gitignore
	M			ExtJs.gitignore
	V			{Gcov.gitignore ← gcov.gitignore}
	M			GitBook.gitignore
	M			Global/Eclipse.gitignore
	M			Global/EiffelStudio.gitignore
	M			Global/Ensime.gitignore
	A			Global/GPG.gitignore
	M			Global/JDeveloper.gitignore
	M			Global/JetBrains.gitignore
	M			Global/Lazarus.gitignore
	M			Global/Linux.gitignore
	M			Global/Mercurial.gitignore
	M			Global/MicrosoftOffice.gitignore
	M			Global/NetBeans.gitignore
	M			Global/OSX.gitignore
	A			Global/Otto.gitignore
	M			Global/README.md
	A			Global/Redis.gitignore
	A			Global/SynopsysVCS.gitignore
	M			Global/Tags.gitignore
	V			Global/{Vim.gitignore ← vim.gitignore}
	M			Global/VirtualEnv.gitignore
	A			Global/VisualStudioCode.gitignore
	V			Global/{WebMethods.gitignore ← webMethods.gitignore}
	M			Global/Xcode.gitignore
	M			Global/XilinxISE.gitignore
	V			Global/{vim.gitignore → Vim.gitignore}
	V			Global/{webMethods.gitignore → WebMethods.gitignore}
	M			Gradle.gitignore
	M			Haskell.gitignore
	A			IGORPro.gitignore
	M			Jekyll.gitignore
	M			Joomla.gitignore
	D			Jython.gitignore
	A			KiCAD.gitignore
	M			LICENSE
	M			Laravel.gitignore
	P			Lua.gitignore Copied from C.gitignore
	M			Magento.gitignore
	M			Maven.gitignore
	M			Mercury.gitignore
	D			Meteor.gitignore
	V			{Nanoc.gitignore ← nanoc.gitignore}
	A			Nim.gitignore
	M			Node.gitignore
	M			OCaml.gitignore
	M			Objective-C.gitignore
	M			OpenCart.gitignore
	M			Perl.gitignore
	M			PlayFramework.gitignore
	M			Prestashop.gitignore
	M			Python.gitignore
	M			Qt.gitignore
	M			R.gitignore
	M			README.md
	M			Rails.gitignore
	M			Ruby.gitignore
	M			Rust.gitignore
	M			Sass.gitignore
	V			{Stella.gitignore ← stella.gitignore}
	M			Swift.gitignore
	M			Symfony.gitignore
	M			TeX.gitignore
	M			Typo3.gitignore
	M			Umbraco.gitignore
	M			Unity.gitignore
	A			UnrealEngine.gitignore
	M			VisualStudio.gitignore
	M			Waf.gitignore
	M			WordPress.gitignore
	V			{gcov.gitignore → Gcov.gitignore}
	V			{nanoc.gitignore → Nanoc.gitignore}
	V			{stella.gitignore → Stella.gitignore}