summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1625 from gennadiycivil/masterGennadiy Civil2018-06-111-1/+1
|\
| * Merge branch 'master' of https://github.com/google/googletestrefs/pull/1625/headGennadiy Civil2018-06-110-0/+0
| |\ | |/ |/|
* | Merge pull request #1624 from gennadiycivil/masterGennadiy Civil2018-06-1113-50/+33
|\ \
| | * Sync with internal docsGennadiy Civil2018-06-111-1/+1
| |/
| * Removed "Documentation.md" not adding value and not consitent with internal docsrefs/pull/1624/headGennadiy Civil2018-06-112-17/+0
| * Rename Samples.md to samples.md and adjust the linksGennadiy Civil2018-06-113-2/+2
| * Rename FAQ.md to faq.md and adjust the links. Gennadiy Civil2018-06-114-4/+4
| * Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-06-111-2/+2
| |\ | |/ |/|
* | Merge pull request #1623 from Steelskin/fuchsia-fdioGennadiy Civil2018-06-111-2/+2
|\ \
| * | Fuchsia: Change fdio include path.refs/pull/1623/headFabrice de Gans-Riberi2018-06-071-2/+2
|/ /
| * Rename AdvancedGuide.md to advanced.md and adjust the links. Gennadiy Civil2018-06-119-17/+17
| * Rename "Primer.md" to "primer.md" and adjust links. Part of the documentaion ...Gennadiy Civil2018-06-117-15/+15
|/
* 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
|/