aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [Objective-C] Fixes a broken linkKyle Fuller2014-04-241-1/+1
* Merge pull request #1045 from DaikiMaekawa/masterCarl Suster2014-04-241-21/+16
|\
| * Remove unnecessary rulesDaikiMaekawa2014-04-231-20/+15
| * Fixed typoDaikiMaekawa2014-04-171-21/+21
* | Merge pull request #1055 from PR3x/masterCarl Suster2014-04-244-4/+4
|\ \
| * | Fix eol issuesJacob Rigby2014-04-234-4/+4
|/ /
* | Merge pull request #1049 from szpssky/szpCarl Suster2014-04-231-0/+3
|\ \
| * | add ignore log files(Android)szp2014-04-191-0/+3
* | | Merge pull request #1043 from Pilchie/masterMarkus Olsson2014-04-231-1/+1
|\ \ \ | |/ / |/| |
| * | Add trailing / for Roslyn cache directoriesKevin Pilch-Bisson2014-04-161-1/+1
| |/
* | Merge pull request #1048 from grossadamm/patch-1Carl Suster2014-04-191-1/+1
|\ \ | |/ |/|
| * Changing been to being per https://github.com/tmountjrAdam Gross2014-04-181-1/+1
| * Simple grammar updateAdam Gross2014-04-181-1/+1
|/
* Merge pull request #1040 from NSElvis/masterCarl Suster2014-04-162-0/+2
|\
| * Ignore xcuserstateElvis Nuñez2014-04-151-0/+1
| * Ignore xcuserstateElvis Nuñez2014-04-151-0/+1
* | Merge pull request #1042 from stenskjaer/patch-1Carl Suster2014-04-161-0/+3
|\ \
| * | Added .rel-filesMichael S. Christensen2014-04-161-0/+3
|/ /
* | Merge pull request #1041 from UltraWalker/feature/add_laravel4_frameworkCarl Suster2014-04-161-0/+3
|\ \ | |/ |/|
| * Laravel4 gitignoreAlireza Zabandan2014-04-161-0/+3
* | Merge pull request #1038 from superlukas/osx-commentCarl Suster2014-04-161-1/+1
|\ \
| * | Fixed typo in commentLukas Böcker2014-04-151-1/+1
|/ /
* | Merge pull request #1035 from AArnott/masterCarl Suster2014-04-151-0/+3
|\ \
| * | Adds Roslyn .ide directories to .gitignore.Andrew Arnott2014-04-141-0/+3
|/ /
* | Merge pull request #1008 from maieul/masterCarl Suster2014-04-141-0/+9
|\ \ | |/ |/|
| * combining numbering rule for eledmac and be less devourermaieul2014-04-041-9/+6
| * Revert "handout"maieul2014-04-041-3/+0
| * handoutMaïeul Rouquette2014-03-201-0/+3
| * (e)ledmac/(e)ledparMaïeul Rouquette2014-03-201-0/+12
* | Merge pull request #1033 from carpii/osx_tweakCarl Suster2014-04-121-1/+1
|\ \
| * | Ignore more osx/afp clutterCarpii (iMac)2014-04-111-1/+1
* | | Merge pull request #1031 from teslitsky/masterCarl Suster2014-04-111-1/+1
|\ \ \
| * | | Returned lost config fileDmitry Teslitsky2014-04-081-1/+1
| * | | Merge pull request #1 from github/masterDmitry Teslitsky2014-04-0831-42/+111
| |\ \ \
* | \ \ \ Merge pull request #1032 from ohnit/VisualStudioRevertPackageCarl Suster2014-04-111-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Revert "Packages folder is ignored correctly".Justin Howlett2014-04-101-1/+1
|/ / / /
* | | | Merge branch 'fix-1022'Carl Suster2014-04-062-3/+18
|\ \ \ \
| * | | | Remove Obj-C-specific hmap & ipa from general Xcode templateCarl Suster2014-04-062-3/+0
| * | | | Remove profile from Obj-C to match #956Carl Suster2014-04-061-1/+0
| * | | | put back Xcode ignore to Objective-C.Konstantin Koval2014-03-311-0/+19
* | | | | Merge pull request #885 from acrogenesis/patch-1Carl Suster2014-04-051-0/+2
|\ \ \ \ \
| * | | | | add notice about secret filesAdrian Rangel2014-04-041-0/+2
* | | | | | Merge pull request #928 from dlion/sftpCarl Suster2014-04-041-0/+3
|\ \ \ \ \ \
| * | | | | | Moved to globalDomenico LucianI2014-04-042-1/+3
| * | | | | | Added gitignore to ignore sftp-config.json fileDomenico Leone Luciani2014-01-201-0/+1
* | | | | | | Merge branch 'fix-956'Carl Suster2014-04-041-1/+0
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Remove profile rule from Xcode template. Fixes #956Jim Roepcke2014-04-041-1/+0
|/ / / / / /
* | | | | | Merge pull request #950 from bbodenmiller/patch-1Carl Suster2014-04-041-0/+2
|\ \ \ \ \ \
| * | | | | | fix typo, will squash commits laterBen Bodenmiller2014-02-181-1/+1
| * | | | | | ignore web deploy settings by defaultBen Bodenmiller2014-02-171-0/+2