summaryrefslogtreecommitdiffstats
path: root/googletest
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * 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-116-14/+14
* | Rename "Primer.md" to "primer.md" and adjust links. Part of the documentaion ...Gennadiy Civil2018-06-114-4/+4
|/
* Merge branch 'master' into fuchsia-launchpad-removalrefs/pull/1619/headGennadiy Civil2018-06-042-0/+10
|\
| * Upstream, cl/199129756refs/pull/1620/headGennadiy Civil2018-06-042-0/+10
* | Clean upFabrice de Gans-Riberi2018-05-311-5/+1
* | Remvoe launchpad dependency from Fuchsia.Fabrice de Gans-Riberi2018-05-311-23/+26
|/
* Formatting changes refs/pull/1607/headGennadiy Civil2018-05-2328-28/+28
* Merge branch 'master' into unused-variable-fuchsiarefs/pull/1603/headGennadiy 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
* | | Remove unused variable in Fuchsia.Fabrice de Gans-Riberi2018-05-111-1/+1
| |/ |/|
* | 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
|/
* 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
* mergingGennadiy Civil2018-04-111-2/+2
* mergingGennadiy Civil2018-04-101-1/+1
* mergingGennadiy Civil2018-04-101-3/+4
* mergeGennadiy Civil2018-04-101-4/+3
|\
| * Revert "gmock actions 2"refs/pull/1556/headGennadiy Civil2018-04-101-13/+0
| * this should be itGennadiy Civil2018-04-091-4/+0
| * yet moreGennadiy Civil2018-04-091-3/+3
| * formattingGennadiy Civil2018-04-091-1/+3
| * moreGennadiy Civil2018-04-091-6/+9
* | RE-Doing the merge, this time with gcc on mac in the PR so I can catch errors...Gennadiy Civil2018-04-101-3/+4
|/
* more warningsGennadiy Civil2018-04-061-0/+1
* more MSVC warningsGennadiy Civil2018-04-061-0/+11
* Merge branch 'master' into fix_locale_winrefs/pull/1543/headGennadiy Civil2018-04-041-1/+3
|\
| * Tweaking https://github.com/google/googletest/pull/1523 to exclude naclrefs/pull/1542/headGennadiy Civil2018-04-041-1/+3
* | fix build break on locale windowsfo402252018-04-041-1/+1
|/
* Merge branch 'master' into int3refs/pull/1523/headGennadiy Civil2018-04-031-1/+1
|\
| * Upstreaming, cl 191344765Gennadiy Civil2018-04-031-1/+1
* | Merge branch 'master' into int3Gennadiy Civil2018-04-031-19/+5
|\ \ | |/
| * merging port, cont. 191443078refs/pull/1539/headGennadiy Civil2018-04-031-3/+5
| * merging, cont - 2Gennadiy Civil2018-04-031-16/+0
* | Merge branch 'master' into int3Gennadiy Civil2018-04-031-10/+22
|\ \ | |/
| * merging gtest-port.h , 191439094Gennadiy Civil2018-04-031-4/+7
| * merging, just comments formatrefs/pull/1537/headGennadiy Civil2018-04-031-1/+3