summaryrefslogtreecommitdiffstats
path: root/googletest
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into deprecateGennadiy Civil2018-07-3025-1/+44
|\
| * small tweaks, OSS merge cl 206357486Gennadiy Civil2018-07-301-1/+1
| * added missing commentsrefs/pull/1688/headGennadiy Civil2018-07-272-2/+2
| * Formatting changes for automatic code managementGennadiy Civil2018-07-2724-0/+43
* | Merge branch 'master' into deprecateGennadiy Civil2018-07-264-18/+11
|\ \ | |/
| * Formatting changes, code syncrefs/pull/1684/headGennadiy Civil2018-07-253-5/+4
| * Update primer.mdrefs/pull/1678/headStian Valle2018-07-211-12/+6
| * Update primer.mdStian Valle2018-07-211-12/+12
| * Update primer.mdStian Valle2018-07-211-7/+7
* | Merge branch 'master' into deprecateGennadiy Civil2018-07-201-4/+0
|\ \ | |/
| * code mergerefs/pull/1676/headGennadiy Civil2018-07-201-4/+0
* | Merge branch 'master' into deprecateGennadiy Civil2018-07-194-1918/+1719
|\ \ | |/
| * Fix linkrefs/pull/1671/headGennadiy Civil2018-07-181-1/+1
| * Formatting and a linkGennadiy Civil2018-07-182-2/+2
| * Merge pull request #1667 from hckr/patch-1Gennadiy Civil2018-07-181-2/+2
| |\
| | * Fix broken links to FAQ in primer.mdrefs/pull/1667/headJakub Młokosiewicz2018-07-161-2/+2
| * | Merge branch 'master' of https://github.com/google/googletestrefs/pull/1670/headGennadiy Civil2018-07-1710-37/+399
| |\ \ | | |/
| * | Docs syncGennadiy Civil2018-07-173-1915/+1716
* | | Disable MSVC function deprecation when using ClangLoo Rong Jie2018-07-134-8/+24
| |/ |/|
* | Merge branch 'master' into stacktracerefs/pull/1653/headDerek Mauro2018-07-124-320/+386
|\ \
| * | Adds the UniversalPrinter for absl::variant.refs/pull/1662/headDerek Mauro2018-07-121-0/+23
| * | Merge branch 'master' into googletest_for_asamrefs/pull/1647/headGennadiy Civil2018-07-112-319/+362
| |\ \ | | |/
| | * more formatting [skip ci]refs/pull/1656/headGennadiy Civil2018-07-111-17/+0
| | * formatting, [ci skip]Gennadiy Civil2018-07-111-1/+1
| | * Fix heading Gennadiy Civil2018-07-101-1/+1
| | * Docs syncGennadiy Civil2018-07-102-313/+373
| * | VS2005 with SP1(_MSC_VER=1400) already supports __pragma杜修杏2018-06-291-1/+1
| |/
* | Pass the --no_stacktrace_support argument to the CMake testsDerek Mauro2018-07-102-5/+5
* | Adds stacktrace support from Abseil to Google TestDerek Mauro2018-07-106-31/+370
|/
* Eliminate GTEST_TEST_FILTER_ENV_VAR_.refs/pull/1622/headRohan Joyce2018-06-145-8/+129
* Merge branch 'master' into stdstringrefs/pull/1627/headTakuto Ikuta2018-06-141-34/+34
|\
| * Docs sync/internalrefs/pull/1631/headGennadiy Civil2018-06-131-32/+32
| * Doc sync/internalGennadiy Civil2018-06-131-2/+2
* | Merge branch 'master' into stdstringGennadiy Civil2018-06-131-187/+168
|\ \ | |/
| * Sync with internal docsrefs/pull/1626/headGennadiy Civil2018-06-111-187/+168
* | Reduce the number of strcmp calling while initializationTakuto Ikuta2018-06-121-3/+3
|/
* 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-111-16/+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
|\
| * 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
|\