summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge pull request #1194 from joshbodily/josh/fix_scoped_class2Gennadiy Civil2018-08-212-0/+21
|\ \
| * \ Merge branch 'master' into josh/fix_scoped_class2refs/pull/1194/headGennadiy Civil2018-08-2023-40/+203
| |\ \ | |/ / |/| |
* | | Update CONTRIBUTING.mdGennadiy Civil2018-08-201-4/+5
* | | Merge pull request #1759 from gennadiycivil/masterGennadiy Civil2018-08-200-0/+0
|\ \ \
| * \ \ mergerefs/pull/1759/headGennadiy Civil2018-08-2014-19/+70
| |\ \ \ | |/ / / |/| | |
* | | | googletest exportmisterg2018-08-2011-9/+63
* | | | googletest exportmisterg2018-08-203-0/+18
| * | | Testing, adding a few line to sample4refs/pull/1758/headGennadiy Civil2018-08-2013-532/+21
| * | | Testing, adding to sample4 unittestGennadiy Civil2018-08-2010-0/+532
|/ / /
* | | Merge pull request #1754 from vkotovv/docs-advanced-broken-linksGennadiy Civil2018-08-201-5/+5
|\ \ \
| * | | docs: fix more broken links to sections in Advanced guiderefs/pull/1754/headVadim Kotov2018-08-201-3/+3
| * | | docs: fixed broken references to sections in Advanced guideVadim Kotov2018-08-201-2/+2
* | | | Merge pull request #1120 from tanzislam/fix_death_test_child_mingw_wer_issue1116Gennadiy Civil2018-08-201-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116refs/pull/1120/headGennadiy Civil2018-08-201-0/+17
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #1347 from Burgch/fix-argcGennadiy Civil2018-08-191-0/+17
|\ \ \ \
| * \ \ \ Merge branch 'master' into fix-argcrefs/pull/1347/headGennadiy Civil2018-08-193-8/+14
| |\ \ \ \ | |/ / / / |/| | | |
| * | | | Minor formatting/style changesGennadiy Civil2018-08-171-8/+7
| * | | | Merge branch 'master' into fix-argcConor Burgess2018-08-17222-7276/+13402
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into fix-argcConor Burgess2018-02-1266-388/+1319
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into fix-argcConor Burgess2018-01-1284-917/+1031
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into fix-argcGennadiy Civil2017-12-084-1/+8
| |\ \ \ \ \ \ \
| * | | | | | | | Fix location of `_NSGetArgv` correction.Conor Burgess2017-12-071-10/+11
| * | | | | | | | Fix value pointed to by `_NSGetArgc()` on macOSConor Burgess2017-12-071-0/+16
| | | | | | * | | Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116Gennadiy Civil2018-08-182-4/+10
| | | | | | |\ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
* | | | | | | | | Merge pull request #1612 from wkaluza/fix-msvc-d9025-warningGennadiy Civil2018-08-181-0/+5
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into fix-msvc-d9025-warningrefs/pull/1612/headGennadiy Civil2018-08-17203-3123/+3652
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| * | | | | | | | | Remove default /EHsc compiler flagWojciech Kaluza2018-07-111-0/+5
* | | | | | | | | | Merge pull request #1652 from medithe/patch-1Gennadiy Civil2018-08-181-4/+5
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into patch-1refs/pull/1652/headGennadiy Civil2018-08-171-4/+4
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | FormattingGennadiy Civil2018-08-171-4/+5
| * | | | | | | | | | Merge branch 'master' into patch-1Gennadiy Civil2018-08-176-15/+93
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'master' into patch-1Gennadiy Civil2018-08-15204-3409/+3903
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Cast the tr1::tuple_element template parameter to intmedithe2018-07-091-2/+2
| | | | | | | | | * | | Merge branch 'fix_death_test_child_mingw_wer_issue1116' of https://github.com...Tanzinul Islam2018-08-170-0/+0
| | | | | | | | | |\ \ \
| | | | | | | | | | * \ \ Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116Gennadiy Civil2018-08-16216-5507/+6416
| | | | | | | | | | |\ \ \
| | | | | | | | | * | \ \ \ Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116Tanzinul Islam2018-08-17183-916/+1265
| | | | | | | | | |\ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #1748 from laixer/stdGennadiy Civil2018-08-171-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | std references shouldn't be fully qualifiedrefs/pull/1748/headVadim Berezniker2018-08-171-4/+4
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #1546 from henryiii/cleanup-cmakeGennadiy Civil2018-08-172-8/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into cleanup-cmakerefs/pull/1546/headHenry Schreiner2018-08-173-7/+49
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #1646 from tisi1988/masterGennadiy Civil2018-08-161-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | was not quite right, refs/pull/1646/headGennadiy Civil2018-08-160-0/+0
| * | | | | | | | | | | | | | Small formatting changeGennadiy Civil2018-08-161-2/+2
| * | | | | | | | | | | | | | Merge branch 'master' into masterGennadiy Civil2018-08-163-5/+58
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #1142 from scottslacksmith/masterGennadiy Civil2018-08-161-2/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Small style changes. refs/pull/1142/headGennadiy Civil2018-08-161-14/+8
| * | | | | | | | | | | | | | Merge branch 'master' into masterGennadiy Civil2018-08-16245-8293/+15406
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'master' of https://github.com/google/googletestScott Slack-Smith2017-11-24167-28439/+3702
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | *Silence false positive memory leaks reported by Microsoft's debug CRT*Scott Slack-Smith2017-06-301-2/+50
| | | * | | | | | | | | | | | | Merge branch 'master' into masterGennadiy Civil2018-08-15174-479/+293
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / | | | | |/| | | | | | | | | | |