 Justin Spahr-Summers
|
f0f5e38db2
|
Merge pull request #760
|
2013-11-13 14:19:22 -08:00 |
|
|
Justin Spahr-Summers
|
4a7ab06382
|
Remove generic and Java ignore patterns
Those belong in other ignore files.
|
2013-11-13 14:19:16 -08:00 |
|
|
Justin Spahr-Summers
|
52628ac489
|
Merge pull request #506
|
2013-11-11 09:51:50 -08:00 |
|
|
Justin Spahr-Summers
|
1a1de190ae
|
Merge remote-tracking branch 'origin/master' into pr/506
Conflicts:
Yii.gitignore
|
2013-11-11 09:51:38 -08:00 |
|
|
Justin Spahr-Summers
|
77e8071b0f
|
Merge remote-tracking branch 'matzew/master' (pull request #418)
|
2013-07-02 13:09:57 -07:00 |
|
|
Justin Spahr-Summers
|
c61686f988
|
Merge remote-tracking branch 'exalted/master'
|
2012-08-27 09:21:32 -07:00 |
|
|
Justin Spahr-Summers
|
f1cb24b9c2
|
Merge remote-tracking branch 'stig/patch-1'
Conflicts:
Objective-C.gitignore
|
2012-08-27 03:29:25 -07:00 |
|
|
Justin Spahr-Summers
|
fae236e74a
|
Merge remote-tracking branch 'arsenm/patch-1'
Conflicts:
C.gitignore
|
2012-08-02 19:03:14 -07:00 |
|
|
Justin Spahr-Summers
|
8486f22049
|
Merge remote-tracking branch 'OliverLetterer/patch-1'
Conflicts:
Objective-C.gitignore
|
2012-08-02 19:02:06 -07:00 |
|