aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* New Visual Studio database engine for C++Vladislav Yaroslavlev2015-12-041-0/+2
| | | | | | | Added extensions of new database engine for C++ (sqlite-based) from Visual Studio 2015 (Tools - Options - Text Editor - C/C++ - Experimental - Enable New Database Engine)
* Merge remote-tracking branch 'refs/remotes/github/master'Vladislav Yaroslavlev2015-12-0481-127/+729
|\
| * Merge pull request #1779 from ffsantos92/patch-1Brendan Forster2015-12-031-0/+2
| |\ | | | | | | Update OpenCart.gitignore
| | * Update OpenCart.gitignoreFábio Santos2015-12-021-0/+2
| |/ | | | | Ignore storage folder (contains logs, cache, etc.)
| * Merge pull request #1778 from anurse/patch-3Brendan Forster2015-12-021-0/+1
| |\ | | | | | | Add 'opendb' file to VisualStudio.gitignore
| | * Add 'opendb' file to VisualStudio.gitignoreAndrew Stanton-Nurse2015-12-011-0/+1
| |/
| * Merge pull request #1774 from cbadke/vs-typoBrendan Forster2015-12-011-2/+2
| |\ | | | | | | Fix typo for Azure Emulator log directory
| | * Fix typo rfc -> rcfCurtis Badke2015-11-301-1/+1
| | |
| | * Fix typo for Azure Emulator log directoryCurtis Badke2015-11-301-1/+1
| |/
| * Merge pull request #1773 from julien731/patch-1Brendan Forster2015-11-301-1/+1
| |\ | | | | | | Incorrect Dir Path
| | * Incorrect Dir PathJulien Liabeuf2015-11-301-1/+1
| |/ | | | | When generating the ignore rules for Composer, an incorrect format is used. The vendor directory added is written `vendor/`, which causes other `vendors` directories to be ignored. The correct format to use is `/vendor/`, which would only ignore the root `vendor` directory.
| * Merge pull request #1772 from tsteinholz/patch-2Brendan Forster2015-11-301-1/+1
| |\ | | | | | | Update Qt.gitignore
| | * Update Qt.gitignoreThomas Steinholz2015-11-291-1/+1
| | | | | | | | | Qt generates build files for me that are `build-Projname-WhateverWhatever` so this change continues to support *-build-* folders as well as others.
| * | Merge pull request #1771 from Dveim/masterBrendan Forster2015-11-301-1/+0
| |\ \ | | |/ | |/| remove harmful line from PlayFramework.gitignore
| | * remove harmful ignoredveim2015-11-291-1/+0
| |/ | | | | | | | | 'project/project' is valid directory for 'project' project-related files. For example, if one configure his sbt build to use scala files directly from 'project/', dependencies like 'project/project/plugins.sbt' will be ignored because of this line. See http://www.scala-sbt.org/0.13/tutorial/Organizing-Build.html#sbt+is+recursive.
| * Merge pull request #1762 from lcorbasson/patch-2Brendan Forster2015-11-191-0/+4
| |\ | | | | | | Add ignores for autoscan files
| | * Update Autotools.gitignoreLoïc Corbasson2015-11-201-4/+4
| | |
| | * Add ignores for autoscan filesLoïc Corbasson2015-11-201-0/+4
| |/
| * Merge pull request #1761 from nrbrook/masterBrendan Forster2015-11-193-3/+0
| |\ | | | | | | Remove *.xcscheme from Global/Xcode.gitignore,Objective-C.gitignore and…
| | * Remove *.xcscheme to Global/Xcode.gitignore,Objective-C.gitignore and ↵Nick Brook2015-11-193-3/+0
| |/ | | | | | | Swift.gitignore
| * Merge pull request #1754 from mypetyak/masterBrendan Forster2015-11-161-1/+1
| |\ | | | | | | Updated LICENSE year to 2015
| | * Updated LICENSE year to 2015Christopher Bunn2015-11-141-1/+1
| | |
| * | Merge pull request #1757 from Arvur/masterBrendan Forster2015-11-161-0/+8
| |\ \ | | | | | | | | Delphi: More extensions to ignore
| | * | Rarely used binary extensionDenis Grinyuk2015-11-161-0/+1
| | | | | | | | | | | | | | | | OLE Control eXtension (OCX), created by the Active Form wizard
| | * | Some C++ file extensions used by DelphiDenis Grinyuk2015-11-161-0/+7
| | | | | | | | | | | | | | | | These depend of "C/C++ Output file generation" compiler setting
| * | | Merge pull request #1756 from habi/patch-3Brendan Forster2015-11-161-0/+4
| |\ \ \ | | |_|/ | |/| | Adding endfloat.sty auxiliary files
| | * | Adding endfloat.sty auxiliary filesDavid Haberthür2015-11-161-0/+4
| |/ / | | | | | | | | | | | | endfloat.sty produces these two auxiliary files. From Section 3.2 of its documentation: > Loading it will have LTEX produce two extra files with .ttt and .fff extensions (for tables and figures, respectively).
| * | Merge pull request #1752 from waynenilsen/patch-1Brendan Forster2015-11-131-0/+4
| |\ \ | | |/ | |/| add Cargo.lock to gitignore file by default
| | * added commentWayne Nilsen2015-11-131-0/+3
| | |
| | * add Cargo.lock to gitignore file by defaultWayne Nilsen2015-11-131-0/+1
| |/ | | | | | | | | | | See the [official recommendation](http://doc.crates.io/guide.html#cargotoml-vs-cargolock) > * If you're building a library, put Cargo.lock in your .gitignore. > * If you're building an executable, check Cargo.lock into git.
| * Merge pull request #1748 from KrauseFx/masterBrendan Forster2015-11-112-0/+4
| |\ | | | | | | [Objective-C / Swift] Updated fastlane docs
| | * Added link to more information about the available optionsFelix Krause2015-11-122-0/+4
| |/
| * Merge pull request #1744 from chenyufeng1991/masterBrendan Forster2015-11-093-0/+3
| |\ | | | | | | add *.xcscheme to Global/Xcode.gitignore,Objective-C.gitignore and Sw…
| | * add *.xcscheme to Global/Xcode.gitignore,Objective-C.gitignore and ↵chenyufeng2015-11-093-0/+3
| |/ | | | | | | Swift.gitignore
| * Merge pull request #1738 from apriendeau/revert-1689-f_GoVendorExperimentBrendan Forster2015-11-071-4/+0
| |\ | | | | | | Revert 2bd7d8ec88bc9fad5aca91951826b16118227554
| | * Revert 2bd7d8ec88bc9fad5aca91951826b16118227554Austin Riendeau2015-11-041-4/+0
| | |
| * | Merge pull request #1661 from JimBobSquarePants/patch-2Brendan Forster2015-11-071-3/+5
| |\ \ | | | | | | | | Update Umbraco.gitignore
| | * | Clean up expired entries, fix whitespace.James Jackson-South2015-11-061-13/+0
| | | |
| | * | Update Umbraco.gitignoreJames Jackson-South2015-09-151-1/+16
| | | | | | | | | | | | Add ImageProcessor cached files and nuget package updates
| * | | Merge pull request #1740 from bondolo/masterBrendan Forster2015-11-051-1/+0
| |\ \ \ | | | | | | | | | | Remove nb-configuration.xml from NetBeans ignore
| | * | | NetBeans file nb-configuration.xml should not be ignored.Mike Duigou2015-11-051-1/+0
| | | | |
| | * | | Merge remote-tracking branch 'github/master'Mike Duigou2015-11-0554-105/+420
| | |\ \ \ | | | | |/ | | | |/|
| * | | | Merge pull request #1739 from jucrouzet/patch-1Brendan Forster2015-11-051-0/+3
| |\ \ \ \ | | |_|/ / | |/| | | Ignore REPL history file
| | * | | Ignore REPL history fileJulien CROUZET2015-11-051-0/+3
| |/ / / | | | | | | | | Like in #1732, Docker images can consider project directoy as $HOME
| * | | Merge pull request #1737 from jutoft/masterBrendan Forster2015-11-041-0/+4
| |\ \ \ | | | | | | | | | | Add pythontex intermediade files to Tex.gitignore
| | * | | Add pythontex intermediade files to Tex.gitignoreJesper Utoft2015-11-041-0/+4
| | | | |
| * | | | Merge pull request #1735 from tyutyutyu/patch-1Brendan Forster2015-11-041-0/+3
| |\ \ \ \ | | |/ / / | |/| | | Update Eclipse.gitignore
| | * | | Update Eclipse.gitignoreIstván Földházi2015-11-031-0/+3
| | | | | | | | | | | | | | | Add ignore for STS's .springBeans file
| * | | | Merge pull request #1734 from JacerOmri/patch-1Brendan Forster2015-11-031-0/+3
| |\ \ \ \ | | |/ / / | |/| | | add bower assets
| | * | | add bower assetsJacer OMRI2015-11-031-0/+3
| |/ / / | | | | | | | | as described in the symfony cookbook http://symfony.com/doc/current/cookbook/frontend/bower.html