Homec4science

Merge remote-tracking branch 'upstream/master'

Authored by Jonathan Chu <jonathan.chu@me.com> on Feb 12 2016, 04:03.

Description

Merge remote-tracking branch 'upstream/master'

Event Timeline

Jonathan Chu <jonathan.chu@me.com> committed rGITIGNORE6ac648f033c4: Merge remote-tracking branch 'upstream/master' (authored by Jonathan Chu <jonathan.chu@me.com>).Feb 12 2016, 04:03

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
3a529da68ab0Brendan Forster
Merge pull request #1856 from mcandre/gradle-intellij-workaround 
Feb 11 2016
cf46e139ad90Andrew Pennebaker
work around intellij gradle wrapper refreshing bug 
Feb 11 2016
ce62a06810c0Brendan Forster
Merge pull request #1854 from RobertoNovelo/master 
Feb 10 2016
436959591a09Roberto Novelo
Merge pull request #1 from RobertoNovelo/enhancement-jetbrains-gitignore 
Feb 10 2016
cd222dfc626eRoberto Novelo
Added Library Mappings and VCS Root 
Feb 10 2016
9ff1a19de877Brendan Forster
Merge pull request #1846 from mcandre/octave-session-info 
Feb 10 2016
f4e1169a0dd8Brendan Forster
Merge pull request #1848 from austinjalexander/patch-1 
Feb 8 2016
d6f33de188faBrendan Forster
Merge pull request #1847 from nloveladyallen/patch-1 
Feb 8 2016
bcbbc6eae2d5Austin J. Alexander
fix style by adding space after # 
Feb 7 2016
31045e29f8d6Noah Lovelady-Allen
Remove redundancy in Global/Vim.gitignore 
Feb 7 2016
98a3ab7719edAndrew Pennebaker
matlab: ignore octave session info 
Feb 6 2016
7e04a3f05c5bBrendan Forster
Merge pull request #1844 from icylogic/Patch-Eagle 
Feb 4 2016
31c960a5ca3dicylogic
update Eagle.gitignore for .lck 
Feb 3 2016
87bd07e50dd9Brendan Forster
Merge pull request #1843 from jutoft/master 
Feb 3 2016
03e1898c933fJesper Utoft
Add ignore for .lox files from fixme package 
Feb 3 2016
fa441f903154Brendan Forster
Merge pull request #1791 from Oddj0b/Calabash 
Jan 28 2016
915a98c83858Brendan Forster
Merge pull request #1615 from maieul/reledmac_endnote 
Jan 28 2016
276cc5877f41Brendan Forster
Merge pull request #1801 from vltr/patch-1 
Jan 27 2016
71bbd933eeb0Richard Kuesters
merging Python.gitignore for PR #1801 
Jan 27 2016
c40da920781fBrendan Forster
Merge pull request #1593 from jcarsique/master 
Jan 27 2016
71e0c804e669Julien Carsique
Add Code Recommenders directory 
Jan 27 2016
8ec50f4b7448Villars Gimm
Move Calabash to Global 
Jan 27 2016
bfabdf19485fMaïeul Rouquette
Merge branch 'master' into reledmac_endnote 
Jan 27 2016
a25a0191d981Brendan Forster
Merge pull request #1475 from LazarusX/master 
Jan 27 2016
edb522ba0b18Ray Fang
Update reference article link 
Jan 27 2016
42110464c9a0Ray Fang
Merge upstream changes 
Jan 27 2016
495ce0e4fbf8Brendan Forster
Merge pull request #1633 from jnycz/patch-1 
Jan 27 2016
80c4cbc53230Brendan Forster
Merge pull request #1609 from habi/patch-1 
Jan 27 2016
1199897c604cBrendan Forster
Merge pull request #1631 from ahmedbaracat/patch-1 
Jan 27 2016
f599ca2f15e1Brendan Forster
Merge pull request #1607 from kc9jud/patch-1 
Jan 27 2016
352c903c34b8Brendan Forster
Merge pull request #1546 from Coeur/patch-1 
Jan 27 2016
8ae0b3e125ecBrendan Forster
Merge pull request #1542 from barraponto/patch-1 
Jan 27 2016
4b2af6fb77acBrendan Forster
Merge pull request #1387 from tyutyutyu/patch-1 
Jan 27 2016
a52383453b4dBrendan Forster
Merge pull request #1683 from edsondota/master 
Jan 27 2016
504f54caf851Brendan Forster
Merge pull request #1415 from wisitsaks/patch-1 
Jan 27 2016
805aee54f12cBrendan Forster
Merge pull request #1836 from jderobot-varribas/Qt/ignore-cmakelists.txt.user 
Jan 26 2016
2c3b06b1ecc0Victor Arribas
Qt: ignore CMakeLists.txt.user 
Jan 25 2016
9f3470db3b00Brendan Forster
Merge pull request #1833 from hzor3000/patch-1 
Jan 24 2016
96ad0e39a54cBrendan Forster
Merge pull request #1835 from pisaacs/patch-1 
Jan 23 2016
9c92fa360fcdpisaacs
Add .byebug_history to gitignore 
Jan 23 2016
514f24b99a1aVahagn Harutyunyan
Add *.VC.opendb for UnrealEngine 
Jan 23 2016
c7557c59a576Brendan Forster
Merge pull request #1831 from chwarr/emacs-server-auth-dir 
Jan 23 2016
9771968355d9Christopher Warrington
Ignore default Emacs server auth dir 
Jan 22 2016
45ce044e6f45Brendan Forster
Merge pull request #1340 from msikma/patch-1 
Jan 21 2016
29bd7031a7e3Michiel Sikma
Merge remote-tracking branch 'upstream/master' into patch-1 
Jan 21 2016
e4c0ed3c209bGaren Torikian
Merge pull request #1826 from pra85/patch-1 
Jan 17 2016
df37ae670c22Garen Torikian
Merge pull request #1827 from DerNivel/patch-1 
Jan 17 2016
cedf149de3ecLevin Rickert
URL doesn't exists anymore 
Jan 17 2016
2cf169922707Prayag Verma
Update license year to 2016 
Jan 16 2016
4215c0f78cf6Arfon Smith
Merge pull request #1617 from manavm/ipynb-checkpoints 
Jan 15 2016