summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Replace "…" with "..."(three dots) to fix warning C4819 in Visual Studio杜修杏2018-07-192-4/+4
* Merge branch 'master' into googletest_for_asamduxiuxing2018-07-198-2122/+1725
|\
| * Merge pull request #1669 from syohex/ignore-ds-storeGennadiy Civil2018-07-181-0/+3
| |\
| | * Merge branch 'master' into ignore-ds-storerefs/pull/1669/headGennadiy Civil2018-07-187-2122/+1722
| | |\ | | |/ | |/|
| * | Merge pull request #1671 from gennadiycivil/masterGennadiy Civil2018-07-184-205/+4
| |\ \
| | * | Fix linkrefs/pull/1671/headGennadiy Civil2018-07-181-1/+1
| | * | Code sync, mostly formatting and removing outdatesGennadiy Civil2018-07-182-203/+2
| | * | Formatting and a linkGennadiy Civil2018-07-183-3/+3
| |/ /
| * | 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 pull request #1670 from gennadiycivil/masterGennadiy Civil2018-07-183-1915/+1716
| |\ \ \ | | |/ / | |/| |
| | * | Merge branch 'master' of https://github.com/google/googletestrefs/pull/1670/headGennadiy Civil2018-07-1712-57/+423
| | |\ \ | | |/ / | |/| |
| | * | Docs syncGennadiy Civil2018-07-173-1915/+1716
| | | * Ignore .DS_Store fileSyohei YOSHIDA2018-07-171-0/+3
| | |/ | |/|
* | | Fix warning C4819: The file contains a character that cannot be represented i...duxiuxing2018-07-173-21/+21
|/ /
* | Merge pull request #1655 from AdrianMoranMontes/masterGennadiy Civil2018-07-161-3/+2
|\ \
| * \ Merge branch 'master' into masterrefs/pull/1655/headAdrian Moran2018-07-1310-53/+420
| |\ \ | |/ / |/| |
* | | Merge pull request #1653 from derekmauro/stacktraceGennadiy Civil2018-07-129-37/+379
|\ \ \
| * \ \ Merge branch 'master' into stacktracerefs/pull/1653/headDerek Mauro2018-07-125-320/+387
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #1662 from derekmauro/variantGennadiy Civil2018-07-122-17/+42
|\ \ \ \
| * | | | Adds the UniversalPrinter for absl::variant.refs/pull/1662/headDerek Mauro2018-07-122-17/+42
|/ / / /
| * | | 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-107-48/+391
| | * | Put ifdef guard after the includes.Adrian Moran2018-07-131-1/+1
| | * | Avoid full test in no exceptions are enabled.Adrian Moran2018-07-121-5/+2
| | * | Merge branch 'master' into masterGennadiy Civil2018-07-113-320/+363
| | |\ \ | |_|/ / |/| | |
* | | | Merge pull request #1647 from duxiuxing/googletest_for_asamGennadiy Civil2018-07-111-1/+1
|\ \ \ \
| * \ \ \ Merge branch 'master' into googletest_for_asamrefs/pull/1647/headGennadiy Civil2018-07-112-319/+362
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #1656 from gennadiycivil/masterGennadiy 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
|/ /
| * Fix issue #1654.Adrian Moran2018-07-111-0/+2
|/
* Merge pull request #1622 from rohanjoyce/bazel_test_filterGennadiy Civil2018-06-145-8/+129
|\
| * Eliminate GTEST_TEST_FILTER_ENV_VAR_.refs/pull/1622/headRohan Joyce2018-06-145-8/+129
|/
* Merge pull request #1633 from gennadiycivil/masterGennadiy Civil2018-06-141-0/+5
|\
| * Merge branch 'master' into masterrefs/pull/1633/headGennadiy Civil2018-06-142-35/+35
| |\ | |/ |/|
* | Merge pull request #1627 from atetubou/stdstringGennadiy Civil2018-06-141-3/+3
|\ \
| * \ Merge branch 'master' into stdstringrefs/pull/1627/headTakuto Ikuta2018-06-141-34/+34
| |\ \ | |/ / |/| |
* | | Merge pull request #1631 from gennadiycivil/masterGennadiy Civil2018-06-131-34/+34
|\ \ \
| * | | Docs sync/internalrefs/pull/1631/headGennadiy Civil2018-06-131-32/+32
| | * | Merge branch 'master' into stdstringGennadiy Civil2018-06-131-187/+168
| | |\ \ | |_|/ / |/| | |
| | * | Reduce the number of strcmp calling while initializationTakuto Ikuta2018-06-121-3/+3
| | | * ignore .md for appveyor buildsGennadiy Civil2018-06-131-0/+5
| | |/ | |/|
| * | Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-06-130-0/+0
| |\ \ | |/ / |/| |
* | | Merge pull request #1626 from gennadiycivil/masterGennadiy Civil2018-06-131-187/+168
|\ \ \ | |_|/ |/| |
| | * Doc sync/internalGennadiy Civil2018-06-131-2/+2
| |/
| * Sync with internal docsrefs/pull/1626/headGennadiy Civil2018-06-111-187/+168
|/