Homec4science

Merge branch 'master' into patch-1

Authored by Antoine Cœur <coeur@gmx.fr> on Aug 15 2015, 16:35.

Description

Merge branch 'master' into patch-1

  • master: (24 commits) Add ignore for npm debug log files Add KiCad ignore for .bck and .kicad_pcb-bak Correct capitalisation of LightSwitch and omit generated.parameters.xml Add newline at EOF Add ignores for Visual Studio Lightswitch build output Adding optional ignore proposal for wwwroot folder Ignore NCrunch temporary files. Update Dart.gitignore Added .stack-work/ directory to Haskell .gitignore. add Android Studio to the covers list Ignore Default RSpec State File Ignore *.auxlock files created by TikZ in TeX Ignore files created by \tikzexternalize Update Typo3.gitignore for CMS v6.2 [ObjC][Swift] Ignore Xcode SCM blueprint files include preamble files generated by mylatexformat package Add .jar, .exe and .msi Remove .SRCINFO (and old .AURINFO) from .gitignore Add CMakeScripts directory ignore OAuth2 token ...

Conflicts:
Objective-C.gitignore
Swift.gitignore

Event Timeline

Antoine Cœur <coeur@gmx.fr> committed rGITIGNOREf17925fe612c: Merge branch 'master' into patch-1 (authored by Antoine Cœur <coeur@gmx.fr>).Aug 15 2015, 16:35

Merged Changes

CommitAuthorDetailsCommitted
573fd7e4d914Brendan Forster
Merge pull request #1613 from cyrbil/patch-1 
Aug 7 2015
5e87c947e4edcyrbil
Add ignore for npm debug log files 
Aug 6 2015
92fe23112d18Brendan Forster
Merge pull request #1370 from SamWhited/patch-2 
Jul 31 2015
eb3cce31df27Brendan Forster
Merge pull request #1604 from Caerbannog/kicad 
Jul 31 2015
519f1e4c4bd4Brendan Forster
Merge pull request #1578 from nex3/patch-1 
Jul 31 2015
bb2e97662601Martin d'Allens
Add KiCad ignore for .bck and .kicad_pcb-bak 
Jul 27 2015
d4c9696398b9Brendan Forster
Merge pull request #1599 from sfhardman/master 
Jul 24 2015
fe783cceeb37sfhardman
Correct capitalisation of LightSwitch and omit generated.parameters.xml 
Jul 23 2015
e965495f2f0fsfhardman
Add newline at EOF 
Jul 23 2015
2d69d6a7e3f5sfhardman
Add ignores for Visual Studio Lightswitch build output 
Jul 23 2015
073727ccd9b0Brendan Forster
Merge pull request #1590 from JimiC/Optional_Ignore_wwwroot 
Jul 15 2015
1cc49ca596afCarl Suster
Merge pull request #1557 from piccaso/typo3 
Jul 15 2015
b39670b7a1b4Carl Suster
Merge pull request #1531 from emlai/patch-1 
Jul 15 2015
4512f28afcb9Carl Suster
Merge pull request #1519 from github/revert-1465-patch-1 
Jul 15 2015
013def88375bCarl Suster
Merge pull request #1525 from LayZeeDK/patch-1 
Jul 15 2015
24bd92fbfcf5Carl Suster
Merge pull request #1530 from katrinleinweber/patch-1 
Jul 15 2015
57355e994dfaJimiC
Adding optional ignore proposal for wwwroot folder 
Jul 13 2015
2e7537454d3aCarl Suster
Merge pull request #1567 from todd/ruby_spec_examples 
Jul 6 2015
a2f49b7b1427Brendan Forster
Merge pull request #1579 from jamiehumphries/master 
Jul 2 2015
86516d2d2ae8Jamie Humphries
Ignore NCrunch temporary files. 
Jul 1 2015
80b0942d7ee3Natalie Weizenbaum
Update Dart.gitignore 
Jun 30 2015
1587f288ee3cBrendan Forster
Merge pull request #1577 from cdepillabout/add-stack-work 
Jun 30 2015
3d9c786bc093(cdep) illabout
Added .stack-work/ directory to Haskell .gitignore. 
Jun 30 2015
a5f1fb2700ecCarl Suster
Merge pull request #1570 from victorhaggqvist/patch-1 
Jun 28 2015
558460c0a8b3Victor Häggqvist
add Android Studio to the covers list 
Jun 27 2015
f23f998be3d8Todd Bealmear
Ignore Default RSpec State File 
Jun 26 2015
e0df63986afdBrendan Forster
Merge pull request #1564 from 153957/patch-1 
Jun 24 2015
daa440bce8d7Arne de Laat
Ignore *.auxlock files created by TikZ in TeX 
Jun 24 2015
98b1db9283b5Carl Suster
Merge pull request #1562 from 153957/patch-1 
Jun 24 2015
948a87ffc9beArne de Laat
Ignore files created by `\tikzexternalize` 
Jun 24 2015
c25991c1397bBrendan Forster
Merge pull request #1537 from Konfekt/patch-1 
Jun 24 2015
cdfa89334df7Brendan Forster
Merge pull request #1547 from modocache/xcode-ignore-xcscmblueprint 
Jun 18 2015
3bb7541f74e7Brendan Forster
Merge pull request #1534 from marcelkorpel/master 
Jun 18 2015
7112380d9718Florian Fida
Update Typo3.gitignore for CMS v6.2 
Jun 17 2015
b304edf487ceCarl Suster
Merge pull request #1521 from lezed1/patch-1 
Jun 11 2015
4323f1e2c8faBrian Gesiak
[ObjC][Swift] Ignore Xcode SCM blueprint files 
Jun 9 2015
49e7d64fc6b1Konfekt
include preamble files generated by mylatexformat package 
May 29 2015
ebd27357db12Marcel Korpel
Add .jar, .exe and .msi 
May 28 2015
c9073cf3e2fcMarcel Korpel
Remove .SRCINFO (and old .AURINFO) from .gitignore 
May 28 2015
6354db35319fEmil Laine
Add CMakeScripts directory 
May 23 2015
fbe660091e3dKatrin Leinweber
ignore OAuth2 token 
May 20 2015
eab7f25a2b16Lars Gyrup Brink Nielsen
Add slash to .sass-cache 
May 15 2015
f7c6c768c9edZander Bolgar
Remove Meteor.gitignore 
May 14 2015
c63fc582604cBrendan Forster
Revert "Update Maven.gitignore" 
May 14 2015
297b78cea6e3Sam Whited
Update Android.gitignore 
Jan 17 2015