aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1843 from jutoft/masterBrendan Forster2016-02-031-0/+3
|\
| * Add ignore for .lox files from fixme packageJesper Utoft2016-02-031-0/+3
|/
* Merge pull request #1791 from Oddj0b/CalabashBrendan Forster2016-01-281-0/+10
|\
| * Move Calabash to GlobalVillars Gimm2016-01-271-0/+0
| * Based on a template from jmoodyVillars Gimm2015-12-081-0/+10
* | Merge pull request #1615 from maieul/reledmac_endnoteBrendan Forster2016-01-281-1/+2
|\ \
| * \ Merge branch 'master' into reledmac_endnoteMaïeul Rouquette2016-01-2752-77/+392
| |\ \
| * | | reledmac use one individual file by series of endnotes : .Aend, .Bend, .Cend ...Maïeul Rouquette2015-07-181-2/+2
* | | | Merge pull request #1801 from vltr/patch-1Brendan Forster2016-01-281-0/+4
|\ \ \ \
| * \ \ \ merging Python.gitignore for PR #1801Richard Kuesters2016-01-2724-50/+101
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #1593 from jcarsique/masterBrendan Forster2016-01-281-0/+3
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Add Code Recommenders directoryJulien Carsique2016-01-271-0/+3
|/ / / /
* | | | Merge pull request #1475 from LazarusX/masterBrendan Forster2016-01-271-19/+12
|\ \ \ \
| * | | | Update reference article linkRay Fang2016-01-271-1/+1
| * | | | Merge upstream changesRay Fang2016-01-2762-130/+544
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #1633 from jnycz/patch-1Brendan Forster2016-01-271-1/+1
|\ \ \ \ \
| * | | | | Incorrect file pathJohn Nycz2015-08-261-1/+1
* | | | | | Merge pull request #1609 from habi/patch-1Brendan Forster2016-01-271-0/+2
|\ \ \ \ \ \
| * | | | | | Adding more files to ignore when using minitocDavid Haberthür2015-08-041-0/+2
* | | | | | | Merge pull request #1631 from ahmedbaracat/patch-1Brendan Forster2016-01-271-0/+4
|\ \ \ \ \ \ \
| * | | | | | | Removed OS-specific rulesAhmed Baracat2015-08-261-7/+0
| * | | | | | | Allow for ignoring other important filesAhmed Baracat2015-08-251-0/+11
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #1607 from kc9jud/patch-1Brendan Forster2016-01-271-0/+4
|\ \ \ \ \ \ \
| * | | | | | | Update Eagle.gitignorePatrick Fasano2015-08-021-0/+4
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #1546 from Coeur/patch-1Brendan Forster2016-01-273-12/+10
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into patch-1Antoine Cœur2015-08-1519-19/+53
| |\ \ \ \ \ \ \
| * | | | | | | | DerivedData and xcuserdata are folders; *.xcuserstate is always inside xcuser...Antoine Cœur2015-06-083-9/+6
* | | | | | | | | Merge pull request #1542 from barraponto/patch-1Brendan Forster2016-01-271-0/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | document Vim file patternsCapi Etheriel2015-06-051-0/+4
| |/ / / / / / / /
* | | | | | | | | Merge pull request #1387 from tyutyutyu/patch-1Brendan Forster2016-01-271-0/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add Tern plugin to Eclipse.gitignoreIstván Földházi2015-01-291-0/+3
* | | | | | | | | | Merge pull request #1683 from edsondota/masterBrendan Forster2016-01-271-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add local_settings to Django's ignoreEdson Dota2015-10-021-0/+1
* | | | | | | | | | | Merge pull request #1415 from wisitsaks/patch-1Brendan Forster2016-01-271-0/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update VisualStudio.gitignorewisitsaks2015-02-201-0/+1
* | | | | | | | | | | | Merge pull request #1836 from jderobot-varribas/Qt/ignore-cmakelists.txt.userBrendan Forster2016-01-271-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Qt: ignore CMakeLists.txt.userVictor Arribas2016-01-251-0/+4
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #1833 from hzor3000/patch-1Brendan Forster2016-01-241-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add *.VC.opendb for UnrealEngineVahagn Harutyunyan2016-01-231-0/+1
* | | | | | | | | | | | | Merge pull request #1835 from pisaacs/patch-1Brendan Forster2016-01-241-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Add .byebug_history to gitignorepisaacs2016-01-231-0/+3
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #1831 from chwarr/emacs-server-auth-dirBrendan Forster2016-01-231-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Ignore default Emacs server auth dirChristopher Warrington2016-01-221-0/+3
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #1340 from msikma/patch-1Brendan Forster2016-01-211-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into patch-1Michiel Sikma2016-01-2183-124/+797
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #1826 from pra85/patch-1Garen Torikian2016-01-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Update license year to 2016Prayag Verma2016-01-161-1/+1
* | | | | | | | | | | | | | Merge pull request #1827 from DerNivel/patch-1Garen Torikian2016-01-171-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | URL doesn't exists anymoreLevin Rickert2016-01-171-1/+0
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #1617 from manavm/ipynb-checkpointsArfon Smith2016-01-151-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \