Merge pull request #1 from github/master
Updating fork
Description
Description
Details
Details
- Committed
Dmitry Teslitsky <dmitry@teslitsky.info> Apr 8 2014, 17:38 - Pushed
aubort Jul 2 2018, 16:12 - Parents
- rGITIGNOREb3d27fcf04fa: Merge branch 'fix-1022'
rGITIGNOREeda2ee70de1b: Merge pull request #990 from chiragsanghavi/master - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| b3d27fcf04fa | Carl Suster | Merge branch 'fix-1022' | Apr 6 2014 | |||
| 5f4223833162 | Carl Suster | Remove Obj-C-specific hmap & ipa from general Xcode template | Apr 6 2014 | |||
| 336dd397ffc2 | Carl Suster | Remove profile from Obj-C to match #956 | Apr 6 2014 | |||
| f21b38a70da5 | Carl Suster | Merge pull request #885 from acrogenesis/patch-1 | Apr 5 2014 | |||
| 9d4978d1c8e7 | Adrian Rangel | add notice about secret files | Apr 5 2014 | |||
| 1ee8dd15d6aa | Carl Suster | Merge pull request #928 from dlion/sftp | Apr 4 2014 | |||
| 1314783d1118 | Domenico LucianI | Moved to global | Apr 4 2014 | |||
| 6df8994de717 | Carl Suster | Merge branch 'fix-956' | Apr 4 2014 | |||
| d598b29b0449 | Jim Roepcke/Carl Suster | Remove profile rule from Xcode template. Fixes #956 | Apr 4 2014 | |||
| 4dec7596dc81 | Carl Suster | Merge pull request #950 from bbodenmiller/patch-1 | Apr 4 2014 | |||
| 977641c6f6ad | Carl Suster | Merge pull request #1015 from carpii/master | Apr 4 2014 | |||
| 5375a285f763 | Carl Suster | Merge pull request #1010 from StuntsPT/master | Apr 4 2014 | |||
| 8d5279e2265e | Carl Suster | Merge pull request #1012 from notbear/patch-1 | Apr 4 2014 | |||
| 70f1e3a64139 | Carl Suster | Merge pull request #1028 from jamiehumphries/master | Apr 4 2014 | |||
| d6ffb3cac30c | Jamie Humphries | Do not ignore .ncrunch* in Visual Studio projects. | Apr 3 2014 | |||
| 25ceefa81e60 | Carl Suster | Merge pull request #1021 from onion7878/patch-1 | Apr 1 2014 | |||
| 9707fd125c5e | Konstantin Koval | put back Xcode ignore to Objective-C. | Mar 31 2014 | |||
| b8051dba2f75 | ONion | trim | Mar 31 2014 | |||
| 28c78172be10 | ONion | change ignore file position | Mar 31 2014 | |||
| 321f8518594b | ONion | add delphi .dcu | Mar 31 2014 | |||
| 488b028df3b5 | Carl Suster | Merge pull request #1019 from nnuhanovic/patch-1 | Mar 31 2014 | |||
| 3244810432d2 | Namik Nuhanovic | Add 'pom.xml.versionsBackup' | Mar 31 2014 | |||
| 5342e13bc99d | Ivan Zuzak | ensure single trailing newline | Mar 27 2014 | |||
| 1fb5ad47f452 | Ivan Zuzak | fixup OpenCart double-file situation | Mar 27 2014 | |||
| b7d5856485ea | Carpii (iMac) | Updated OSX.gitignore to include directories commonly created on AFP shares | Mar 26 2014 | |||
| 9e538aa9b8a5 | Carl Suster | Merge pull request #1014 from stevennoto/flexbuilder-fix | Mar 26 2014 | |||
| 485a600a77ef | Steven Noto | Added bin-release folder | Mar 25 2014 | |||
| e5e18e6e53bf | notbear | Fixes uncomplete CTools | Mar 24 2014 | |||
| 22e99e7a8960 | Francisco Pina Martins | Added other common compression formats. | Mar 21 2014 | |||
| 250a511357e9 | Carl Suster | Merge branch 'fix-846' | Mar 21 2014 | |||
| af6b1895ddb7 | Carl Suster | Remove trailing asterisks in Phalcon rules | Mar 21 2014 | |||
| 655e5ba74d5a | Carl Suster | Merge branch 'fix-921' | Mar 21 2014 | |||
| a6cabefb87e1 | Torben Werner/Carl Suster | Increase the specificity of PlayFramework rules | Mar 21 2014 | |||
| 65196929c4f7 | Carl Suster | Merge pull request #967 from tjgrilley/tex-R-updates | Mar 21 2014 | |||
| 4cd753fd0ee9 | Carl Suster | Merge pull request #1007 from fabiensanglard/Xcode | Mar 20 2014 | |||
| 5bd4330b8ca3 | MacPro: Fabien Sanglard | Add Xcode support. | Mar 20 2014 | |||
| 369766d5b99c | Carl Suster | Merge pull request #1006 from munkhoff/add-slickedit-gitignore | Mar 19 2014 | |||
| ddcbdd6a17e2 | John Munkhoff | Edit comment in Global/SlickEdit.gitignore | Mar 19 2014 | |||
| 2fc10c0a97c2 | Carl Suster | Merge pull request #998 from kylef/patch-1 | Mar 19 2014 | |||
| a65b95938c39 | John Munkhoff | Add Global/SlickEdit.gitignore file | Mar 19 2014 | |||
| a3fbb9bd29a0 | Kyle Fuller | [Objective-C] Add a note about CocoaPod's Pods/ | Mar 18 2014 | |||
| 65764ade9fcd | Carl Suster | Merge pull request #1002 from munkhoff/qmake-stash-and-dot-moc | Mar 18 2014 | |||
| f96f48347de8 | John Munkhoff | Update Qt.gitignore - Ignore '*.moc' files (foo.moc created when foo.cpp… | Mar 17 2014 | |||
| 170b9f808b34 | Carl Suster | Merge pull request #1001 from teslitsky/opencart | Mar 16 2014 | |||
| 807ac2633676 | Carl Suster | Merge pull request #991 from devoncarew/patch-1 | Mar 16 2014 | |||
| 7d0df220a0ed | Carl Suster | Merge pull request #993 from tacahilo/add-packer | Mar 16 2014 | |||
| b1c89277877b | Dmitry Teslitsky | Create OpenCart.gitignore | Mar 15 2014 | |||
| 7609a2eb31b0 | Kyle Fuller | [Objective-C] Remove CocoaPods ignores | Mar 13 2014 | |||
| 2fcafd714077 | Takahiro OKUMURA | Add a support for packer | Mar 9 2014 | |||
| e8d7cafc1605 | Devon Carew | Update Dart.gitignore | Mar 8 2014 |