summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1619 from Steelskin/fuchsia-launchpad-removalGennadiy Civil2018-06-051-22/+21
|\
| * Merge branch 'master' into fuchsia-launchpad-removalrefs/pull/1619/headGennadiy Civil2018-06-042-0/+10
| |\ | |/ |/|
* | Merge pull request #1620 from gennadiycivil/masterGennadiy Civil2018-06-042-0/+10
|\ \
| * | Upstream, cl/199129756refs/pull/1620/headGennadiy Civil2018-06-042-0/+10
|/ /
| * Merge branch 'master' into fuchsia-launchpad-removalGennadiy Civil2018-06-042-6/+5
| |\ | |/ |/|
* | Merge pull request #1608 from gennadiycivil/masterGennadiy Civil2018-06-012-6/+5
|\ \
| * | formatting changes refs/pull/1608/headGennadiy Civil2018-05-232-6/+5
|/ /
| * Clean upFabrice de Gans-Riberi2018-05-311-5/+1
| * Remvoe launchpad dependency from Fuchsia.Fabrice de Gans-Riberi2018-05-311-23/+26
|/
* Merge pull request #1607 from gennadiycivil/masterGennadiy Civil2018-05-2330-30/+30
|\
| * Formatting changes refs/pull/1607/headGennadiy Civil2018-05-2330-30/+30
|/
* Merge pull request #1603 from Steelskin/unused-variable-fuchsiaGennadiy Civil2018-05-221-1/+1
|\
| * Merge branch 'master' into unused-variable-fuchsiarefs/pull/1603/headGennadiy Civil2018-05-225-10/+65
| |\ | |/ |/|
* | Merge pull request #1591 from sgraham/disabled-rttiGennadiy Civil2018-05-222-8/+6
|\ \
| * \ Merge branch 'master' into disabled-rttirefs/pull/1591/headGennadiy Civil2018-05-223-2/+59
| |\ \ | |/ / |/| |
* | | Merge pull request #1601 from jdennett/StdLibVersioningGennadiy Civil2018-05-223-2/+59
|\ \ \
| * | | Downgrade to C++98.refs/pull/1601/headJames Dennett2018-05-211-6/+6
| * | | Downgrade to C++98 code.James Dennett2018-05-211-6/+6
| * | | Merge branch 'master' into StdLibVersioningJames Dennett2018-05-212-4/+30
| |\ \ \ | |/ / / |/| | |
| * | | Add support for versioned standard libraries.James Dennett2018-05-111-2/+18
| * | | Update generated code.James Dennett2018-05-111-2/+18
| * | | Add unit test for CanonicalizeForStdLibVersioning.James Dennett2018-05-111-0/+25
| | * | Merge branch 'master' into disabled-rttiScott Graham2018-05-1110-22/+273
| | |\ \ | |_|/ / |/| | |
| | * | Fix gmock not building when -fno-rttiScott Graham2018-05-022-8/+6
| | | * Remove unused variable in Fuchsia.Fabrice de Gans-Riberi2018-05-111-1/+1
| |_|/ |/| |
* | | Merge pull request #1597 from jaeheonlee/masterGennadiy Civil2018-05-112-4/+30
|\ \ \ | |/ / |/| |
| * | Use NULL instead of nullptr, for pre-C++11 builds.refs/pull/1597/headJae Heon Lee2018-05-091-2/+2
| * | Fix the bug where ad_hoc_test_result() functions of UnitTest and TestCase obj...Jae Heon Lee2018-05-072-4/+30
|/ /
* | Merge pull request #1593 from Steelskin/fuchsia_death_testGennadiy Civil2018-05-078-18/+243
|\ \ | |/ |/|
| * Remove magic numberrefs/pull/1593/headFabrice de Gans-Riberi2018-05-031-1/+1
| * Style fixFabrice de Gans-Riberi2018-05-031-1/+1
| * Fix commentsFabrice de Gans-Riberi2018-05-032-6/+6
| * Fix more stuff and get tests to passFabrice de Gans-Riberi2018-05-036-14/+35
| * Get all the things to work.Fabrice de Gans-Riberi2018-05-021-35/+45
| * Fix stuffFabrice de Gans-Riberi2018-05-021-29/+27
| * Add Fuchsia support for death test.Fabrice de Gans-Riberi2018-05-014-4/+200
|/
* Merge pull request #1589 from sgraham/rtti-buildGennadiy Civil2018-05-012-0/+11
|\
| * Add no-exception and no-rtti to build matrixrefs/pull/1589/headScott Graham2018-05-012-0/+11
|/
* Merge pull request #1588 from gennadiycivil/masterGennadiy Civil2018-04-254-597/+619
|\
| * mergedrefs/pull/1588/headGennadiy Civil2018-04-251-1/+0
| |\ | |/ |/|
* | Merge pull request #1582 from dnsunderland/parameterlessGennadiy Civil2018-04-197-13/+426
|\ \
| * \ Merge branch 'master' into parameterlessrefs/pull/1582/headGennadiy Civil2018-04-191-112/+93
| |\ \ | |/ / |/| |
| * | Fix friend declaration to use GTEST_API_ decl spec.David Sunderland2018-04-191-1/+1
| * | Revert useless use of GTEST_API_ on WithoutMatchers decl.David Sunderland2018-04-191-1/+1
| * | Add GTEST_API_ tag to WithoutMatchers class. Hopefully that fixes the problem...David Sunderland2018-04-191-1/+1
| * | Mark new GetWithoutMatchers method as part of the exported API, to address MS...David Sunderland2018-04-192-2/+2
| * | Merge branch 'parameterless' of https://github.com/dnsunderland/googletest in...David Sunderland2018-04-185-270/+438
| |\ \
| | * \ Merge branch 'master' into parameterlessdnsunderland2018-04-185-270/+438
| | |\ \
| * | | | Don't use generalized initializer list; is C++11 extension.David Sunderland2018-04-181-1/+1
| |/ / /
| * | | Clone of unsubmitted cr/176529515. Introduce parameterless expectations.David Sunderland2018-04-187-13/+426