Homec4science

Merge upstream changes

Authored by Ray Fang <i@lazarusx.com> on Jan 27 2016, 07:36.

Description

Merge upstream changes

Event Timeline

Ray Fang <i@lazarusx.com> committed rGITIGNORE42110464c9a0: Merge upstream changes (authored by Ray Fang <i@lazarusx.com>).Jan 27 2016, 07:36

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
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
f51f0baa5a72Brendan Forster
Merge pull request #1812 from AArnott/patch-4 
Jan 15 2016
3299a7e4dc23Brendan Forster
Merge pull request #1819 from adrfer/master 
Jan 15 2016
def395f811edBrendan Forster
Merge pull request #1824 from mimibar/patch-1 
Jan 13 2016
491eca8bda23mimibar
Comments 
Jan 13 2016
da521d7bbf55Brendan Forster
Merge pull request #1814 from AArnott/patch-6 
Jan 12 2016
1c24a55ec3deBrendan Forster
Merge pull request #1822 from rogierslag/master 
Jan 11 2016
7e854d399154Brendan Forster
Merge pull request #1821 from jelford/master 
Jan 11 2016
ce4e9ccd7a71Rogier Slag
Exclude Latexian temp files for Tex documents 
Jan 10 2016
efab0fd13c8bJames Elford
Include lib64 for virtualenv 
Jan 10 2016
be3333655bffBrendan Forster
Merge pull request #1818 from dopefishh/patch-1 
Jan 5 2016
578a7b751484Brendan Forster
Merge pull request #1815 from anderslundsgard/master 
Jan 5 2016
33da976da9a6Adriano Ferreira
Ignore playground.xcworkspace playground file 
Jan 3 2016
679c67738234Adriano Ferreira
Ignore timeline.xctimeline playground file 
Jan 3 2016
3e9a2d98e256dopefishh
Add TeX precompiled preamble and xypic 
Jan 3 2016
fceac113a3a2Brendan Forster
Merge pull request #1629 from raabf/fuse_hidden 
Jan 1 2016
b6f1c2f2a0daBrendan Forster
Merge pull request #1816 from rosolkodv/patch-1 
Jan 1 2016
5fa2ff234591Dmitry Rosolko
Update Eclipse.gitignore 
Dec 31 2015
65ba08ced799Anders Lundsgård
Name update of Windows Azure 
Dec 28 2015
a25589c92187Anders Lundsgård
Ignore Azure ApplicationInsights.config 
Dec 28 2015
656f766bfc75Brendan Forster
Merge pull request #1813 from AArnott/patch-5 
Dec 27 2015
849fa552f217Andrew Arnott
Remove `build/` suppression 
Dec 27 2015
346fb93318b0Andrew Arnott
Stop ignoring StyleCop.json 
Dec 27 2015
6d1612cff432Andrew Arnott
Ignore files generated by NuGet v3 project.json 
Dec 27 2015
8c9b77cb5c85Brendan Forster
Merge pull request #1808 from habi/patch-4 
Dec 21 2015
fe3b2f4d97a4David Haberthür
Ignore auxiliary files from \usepackage{cprotect} 
Dec 21 2015
7adc93eed241Brendan Forster
Merge pull request #1806 from recooper/whitespace-fix 
Dec 17 2015