Merge branch 'master' of https://github.com/github/gitignore
Conflicts:
Global/OSX.gitignore
Description
Description
Details
Details
- Committed
Ali Servet Donmez <asd@pittle.org> Aug 27 2012, 12:40 - Pushed
aubort Jul 2 2018, 16:12 - Parents
- rGITIGNOREf1cb24b9c2cc: Merge remote-tracking branch 'stig/patch-1'
rGITIGNORE54928f53d7d0: Seems like this should go into OSX.gitignore instead. - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| f1cb24b9c2cc | Justin Spahr-Summers | Merge remote-tracking branch 'stig/patch-1' | Aug 27 2012 | |||
| f78c09ffd224 | Coby Chapple | Manual merge to close #305 | Aug 24 2012 | |||
| 4f958411c18c | Coby Chapple | Merge pull request #303 from safwanc/matlab-mex | Aug 24 2012 | |||
| 75da0e1af2c3 | Coby Chapple | Merge pull request #419 from jonhkr/patch-1 | Aug 24 2012 | |||
| 25a1e617c4b0 | Coby Chapple | Merge pull request #420 from vanniksoftware/master | Aug 24 2012 | |||
| a1ef23350d06 | Mike Nikles | Added Appcelerator Titanium .gitignore file. | Aug 23 2012 | |||
| 174c45e796b5 | Jonas Trevisan | Added .AppleDouble to OSX | Aug 22 2012 | |||
| 6670a4c42336 | Stig Brautaset | Ignore .idea/ folder for AppCode users. | May 1 2012 | |||
| dfb30c64093a | Safwan Choudhury | Ignoring compiled MEX binaries for all platforms | Apr 19 2012 |