Merge remote-tracking branch 'origin/master' into pr/506
Conflicts:
Yii.gitignore
Description
Description
Details
Details
- Committed
Justin Spahr-Summers <Justin.SpahrSummers@gmail.com> Nov 11 2013, 18:51 - Pushed
aubort Jul 2 2018, 16:12 - Parents
- rGITIGNORE8335a5dad97d: Merge pull request #615 from kristens/master
rGITIGNORE407664cbb5c6: Added changes for Yii framework See http://www.yiiframework. - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 8335a5dad97d | Adam Roben | Merge pull request #615 from kristens/master | Nov 11 2013 | |||
| 0eb7703d1183 | Adam Roben | Merge pull request #582 from xnt/patch-1 | Nov 11 2013 | |||
| 81c11d90a399 | Adam Roben | Merge pull request #836 from jephir/fix-unity | Nov 11 2013 | |||
| 4469ba493892 | Jephir | Prevent Unity .gitignore from ignoring non-Unity project files | Nov 11 2013 | |||
| 768534c42f42 | Adam Roben | Merge pull request #834 from arcresu/ruby-version | Nov 11 2013 | |||
| e85ec2d82850 | Adam Roben | Merge pull request #488 from nanadevelopment/eeConfigAdd | Nov 11 2013 | |||
| 7bf906575042 | Adam Roben | Merge pull request #477 from neilkelty/master | Nov 11 2013 | |||
| 2fea1b6b925f | Adam Roben | Merge pull request #831 from arcresu/idea | Nov 11 2013 | |||
| 9463c86d9b3f | Adam Roben | Merge pull request #424 from MichaelMBishop/master | Nov 11 2013 | |||
| b5ff70798713 | Justin Spahr-Summers | Merge pull request #421 from matheussl/master | Nov 11 2013 | |||
| 669668fb14be | Carl Suster | Join comments in rails template | Nov 10 2013 | |||
| efd3490a54ae | Carl Suster | Tighten some ruby ignore patterns | Nov 10 2013 | |||
| 0ac2f7cb820b | Carl Suster | Optionally ignore ruby env normalisation files, with comments | Nov 10 2013 | |||
| d72190c56ad3 | Carl Suster | Merge pull request #833 from benmoss/master | Nov 10 2013 | |||
| f4e8e686d6a0 | Ben Moss | Leiningen by default creates a 'target' directory, not 'targets' | Nov 9 2013 | |||
| e0baa57b5850 | Carl Suster | Merge pull request #743 from hkdobrev/master | Nov 9 2013 | |||
| 3932f1f0ce7a | Haralan Dobrev | Add Composer.gitignore for composer packages | Nov 9 2013 | |||
| 4f659df36e63 | Carl Suster | Remove IntelliJ rules from Android -> Global/JetBrains | Nov 9 2013 | |||
| 35c6da6ea180 | Adam Roben | Merge pull request #832 from arcresu/latex | Nov 9 2013 | |||
| 81f8222e7fb5 | Carl Suster | Rename LaTeX->TeX | Nov 8 2013 | |||
| ce47378cc699 | Manuel Rauber/Carl Suster | Ignore .pyg files from LaTeX's minted package | Nov 8 2013 | |||
| 70fd1fd45cd6 | Carl Suster | Sort LaTeX auxiliary files by package | Nov 8 2013 | |||
| 40e48553fdf2 | Carl Suster | Merge pull request #828 from vvolkgang/patch-1 | Nov 8 2013 | |||
| 9ae01d0b642e | Carl Suster | Rename template IDEA->JetBrains | Nov 8 2013 | |||
| af886f72c894 | Carl Suster | Add back out/ for IntelliJ under IDEA | Nov 8 2013 | |||
| 1ef80036f0f7 | Carl Suster | Remove .idea/ from ObjectiveC in favour of Global/IDEA | Nov 8 2013 | |||
| af9ec6115c8d | Carl Suster | Add .idea/tasks.xmk to IDEA ignore suggections | Nov 8 2013 | |||
| fcf0a9ccab20 | Carl Suster | Remove individual JetBrains IDE templates in favour of IDEA template | Nov 8 2013 | |||
| aa00e7f210e4 | Carl Suster | Add an IDEA template to cover all related IDEs | Nov 8 2013 | |||
| 03de45fa7577 | Adam Roben | Merge pull request #829 from arcresu/patch-1 | Nov 8 2013 | |||
| 4d108dc73db3 | Carl Suster | Merge pull request #452 from BFTrick/patch-1 | Nov 8 2013 | |||
| 1f4bf1f36d8e | Patrick Rauland | merging upstream changes | Nov 8 2013 | |||
| 3dadf4e9b3fe | Carl Suster | Make sublime-project rule off by default | Nov 8 2013 | |||
| 024d6e83fcd0 | Carl Suster | Add comment to prevent *.sublime-project being ignored. | Nov 8 2013 | |||
| c67cfaf01ceb | Adam Roben | Merge pull request #830 from kerimdzhanov/fix/node-gitignore | Nov 8 2013 | |||
| fa1ea3d7f2fc | Dan Kerimdzhanov | remove `npm-debug.log` entry | Nov 8 2013 | |||
| f8ac87bd8f39 | Carl Suster | Merge pull request #802 from lukemetz/master | Nov 8 2013 | |||
| 66f5b6f34356 | Adam Roben | Merge pull request #705 from caiquerodrigues/patch-1 | Nov 8 2013 | |||
| 523c52fe52d3 | Adam Roben | Merge pull request #814 from xiaogaozi/patch-1 | Nov 8 2013 | |||
| 684a4fe44bd2 | Adam Roben | Merge pull request #805 from Utumno/patch-1 | Nov 8 2013 | |||
| 4e85d13e9614 | Carl Suster | Merge pull request #623 from seabre/patch-1 | Nov 8 2013 | |||
| e4cc7a56ba06 | Sean Brewer | Merge with latest master from upstream. Fix merge conflict with Leiningen. | Nov 8 2013 | |||
| bd8dab38455b | Carl Suster | Merge pull request #509 from cjerdonek/master | Nov 8 2013 | |||
| c038e773de33 | Chris Jerdonek | Make Python .gitignore directory entries match only directories. | Nov 8 2013 | |||
| 6b7079509839 | Álison Fernandes | Added Visual Studio .suo files | Nov 8 2013 | |||
| 502cb31439a7 | = | Ignore elf and hex in C.gitignore | Nov 8 2013 | |||
| b65855ee93eb | Adam Roben | Merge pull request #636 from msgerbush/patch-1 | Nov 7 2013 | |||
| 95075cccba0e | Michael Gerbush | Merge branch 'master' into patch-1 | Nov 7 2013 | |||
| 7bbc288b5277 | Adam Roben | Merge pull request #501 from karenetheridge/master | Nov 7 2013 | |||
| f94c2a0b7937 | Adam Roben | Merge pull request #505 from abrodkin/qt-additions | Nov 7 2013 |