Merge remote-tracking branch 'upstream/master'
Conflicts:
CSharp.gitignore
VB.Net.gitignore
Description
Description
Details
Details
- Committed
James Cowgill <james410@cowgill.org.uk> Nov 4 2013, 15:39 - Pushed
aubort Jul 2 2018, 16:12 - Parents
- rGITIGNORE799ee6b79e1d: Added MIDL headers (_i.h) to Visual Studio gitignore
rGITIGNORE8e05c7362184: Merge pull request #823 from snisarg/master - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 8e05c7362184 | Adam Roben | Merge pull request #823 from snisarg/master | Nov 4 2013 | |||
| 0abc522d3cb6 | Adam Roben | Merge pull request #819 from normenmueller/master | Nov 4 2013 | |||
| 830889620e8e | Nisarg Shah | Added Windows specific .obj for objects to ignore. | Nov 4 2013 | |||
| fa5269853c54 | Adam Roben | Merge pull request #640 from arcresu/patch-1 | Nov 4 2013 | |||
| 8480473de9bc | Adam Roben | Merge pull request #804 from rutice/osx | Nov 4 2013 | |||
| 7a40a3905306 | Adam Roben | Merge pull request #786 from micole/processingproject | Nov 4 2013 | |||
| 43f3bb39522c | Adam Roben | Merge pull request #751 from nysa/master | Nov 4 2013 | |||
| 50ee7b715637 | Adam Roben | Merge pull request #810 from mildis/master | Nov 4 2013 | |||
| ca5c02406c98 | Adam Roben | Merge pull request #703 from modocache/master | Nov 4 2013 | |||
| 12b76696da7a | Adam Roben | Merge pull request #699 from Bengt/includism | Nov 4 2013 | |||
| 60575531d23e | Adam Roben | Merge pull request #613 from bdukes/patch-3 | Nov 4 2013 | |||
| 0e5ad28f71ef | Adam Roben | Merge pull request #405 from malleor/master | Nov 4 2013 | |||
| 8b686873619e | Adam Roben | Merge pull request #370 from bdsatish/master | Nov 4 2013 | |||
| bb60b9674257 | Adam Roben | Merge pull request #377 from IconoclastLabs/master | Nov 4 2013 | |||
| 7c5547dc2080 | Adam Roben | Merge pull request #378 from agassi/patch-1 | Nov 4 2013 | |||
| b12c6cd59c2f | Markus Olsson | Merge pull request #674 from sayedihashimi/master | Nov 4 2013 | |||
| a7148bf53bc6 | Markus Olsson | Merge pull request #567 from kshapkin/master | Nov 4 2013 | |||
| f63a5cd6c8f1 | Markus Olsson | Merge pull request #709 from jonathanwindle/visualstudio-schemaview | Nov 4 2013 | |||
| 5c15f3f3c6e8 | Markus Olsson | Merge pull request #811 from eddiegroves/patch-1 | Nov 4 2013 | |||
| bfbd2f9f73b5 | Dr. Normen Müller | add `.lib/` to list of Scala ignores | Nov 1 2013 | |||
| 4454b1a93377 | Dr. Normen Müller | add `*.fls` to list of LaTeX ignores | Oct 29 2013 | |||
| eb708a6a041b | eddiegroves | Add WCF tracing file, replace duplicate .log entry | Oct 21 2013 | |||
| 59c668120f4b | mildis | add Windows Installer files | Oct 16 2013 | |||
| d15f0b17fcdf | mildis | add Windows Installer files | Oct 16 2013 | |||
| da36175ff6de | Daisuke Goto | Fix OSX-specific Icon\r rule | Oct 12 2013 | |||
| ecf9bac896e8 | Ivan Žužak | Merge pull request #801 from github/fix-trailing-newlines | Oct 8 2013 | |||
| f0dde55c6bd9 | Ivan Zuzak | ensure single trailing newline | Oct 6 2013 | |||
| 1e9ec334cd2e | micole | Added the processing project | Sep 26 2013 | |||
| 060aed8a931f | Danny Greg | Merge pull request #774 from bdewater/patch-1 | Sep 19 2013 | |||
| 56dbce3df3b1 | Bart | add .xccheckout to Objective-C gitignore | Sep 17 2013 | |||
| c98c138ee171 | Nysa | Vim: Forgot to change *.s[a-w][a-z] to .*.s[a-w][a-z] | Aug 28 2013 | |||
| 0030e9df601b | Nysa | Vim: Ignore .*.s[a-w][a-z] and .s[a-w][a-z] swap files | Aug 28 2013 | |||
| 6c75292e1e06 | Charlie Somerville | Merge pull request #735 from aldo-roman/patch-1 | Aug 26 2013 | |||
| 77cf354916ed | Charlie Somerville | Merge pull request #714 from mattjeffery/ignore_kernel_objects | Aug 26 2013 | |||
| 0bad6cf48bea | Aldo Román Nureña | added secret_token.rb | Aug 12 2013 | |||
| d292bd8207a3 | Matt Jeffery | ignore kernel object files | Jul 19 2013 | |||
| be2ecada6353 | Jonathan Windle | Add schemaview extension to VisualStudio.gitignore | Jul 17 2013 | |||
| 846f1ecbb2cf | modocache | Ignore source control plist files generated by Xcode. | Jul 10 2013 | |||
| a6c76a530820 | Bengt Lüers | There is no need to unignore `.gitignore`. | Jul 5 2013 | |||
| ad1289f0d9b0 | Bengt Lüers | Files and directories starting with a `.` should not be ignored in general. | Jul 5 2013 | |||
| b2c694d792c0 | Justin Spahr-Summers | Merge pull request #576 from nysa/master | Jul 3 2013 | |||
| f3664c06f761 | Justin Spahr-Summers | Merge pull request #493 from strugee/master | Jul 3 2013 | |||
| 444416f0678d | Justin Spahr-Summers | Remove Podfile.lock from Objective-C ignores | Jul 3 2013 | |||
| 77e8071b0fd9 | Justin Spahr-Summers | Merge remote-tracking branch 'matzew/master' (pull request #418) | Jul 2 2013 | |||
| 0acbcf4bfd82 | Matthias Wessendorf | Adding CocoaPods to gitignore | Jul 2 2013 | |||
| 88951d5cc942 | Paul Betts | Merge pull request #694 from anurse/patch-1 | Jun 29 2013 | |||
| f2ab73150aa7 | Andrew Nurse | Unignore "packages/*/build" in VisualStudio.gitignore. | Jun 29 2013 | |||
| 178d2632d809 | Sayed Ibrahim Hashimi | .pubxml file should not be excluded by default | Jun 7 2013 | |||
| 098aee26a1c6 | Ted Nyman | Update LICENSE | May 26 2013 | |||
| 4624470231a1 | Carl Suster | Also ignore additional tempfiles created by the biblatex package. | May 10 2013 |