summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Update README.mdGennadiy Civil2018-09-231-1/+1
* Add .clang-formatGennadiy Civil2018-09-231-0/+4
* Merge pull request #1847 from google/revert-1832-masterGennadiy Civil2018-09-200-0/+0
|\
| * Revert "Added special catch for std::exception in GTEST_TEST_NO_THROW_"refs/pull/1847/headGennadiy Civil2018-09-200-0/+0
|/
* Merge pull request #1843 from matlo607/fix-unittest-msys-ColoredOutputTestGennadiy Civil2018-09-202-3/+4
|\
| * [msys] fix unittest ColoredOutputTest.UsesColorsWhenTermSupportsColorsrefs/pull/1843/headMatthieu Longo2018-09-182-3/+4
* | Merge pull request #1844 from matlo607/fix-msys-build-gmock-matchers_testGennadiy Civil2018-09-201-0/+3
|\ \
| * | [msys] pass big object file option to assembler for target gmock-matchers_testrefs/pull/1844/headMatthieu Longo2018-09-181-0/+3
| |/
* | Merge pull request #1846 from google/9A681768AABE08D1EFA5CA77528236A4Gennadiy Civil2018-09-204-78/+46
|\ \
| * | Googletest exportrefs/pull/1846/headmisterg2018-09-201-0/+1
| * | Googletest exportAbseil Team2018-09-204-78/+45
|/ /
* | Merge pull request #1832 from Jonny007-MKD/masterrefs/pull/1038/headGennadiy Civil2018-09-202-21/+78
|\ \ | |/ |/|
| * Removed some newlinesrefs/pull/1832/headJonny007-MKD2018-09-181-6/+3
| * Avoid these ambiguitiesJonny007-MKD2018-09-151-8/+8
| * Print message of unexpected std::exception in EXPECT_THROW, tooJonny007-MKD2018-09-142-19/+53
| * Merge branch 'master' into masterJonny007-MKD2018-09-144-44/+31
| |\ | |/ |/|
* | Merge pull request #1838 from google/9A681768AABE08D1EFA5CA77528236A4Gennadiy Civil2018-09-142-21/+1
|\ \
| * | Update .travis.ymlrefs/pull/1838/headGennadiy Civil2018-09-141-11/+0
| * | Googletest exportmisterg2018-09-141-10/+1
|/ /
* | Merge pull request #1837 from google/9A681768AABE08D1EFA5CA77528236A4Gennadiy Civil2018-09-142-23/+30
|\ \
| * | Googletest exportrefs/pull/1837/headAbseil Team2018-09-142-23/+30
| | * Merge branch 'master' into masterGennadiy Civil2018-09-142-56/+0
| | |\ | |_|/ |/| |
* | | Merge pull request #1835 from google/gennadiycivil-TR1-docs-cleanupGennadiy Civil2018-09-142-56/+0
|\ \ \ | |/ / |/| |
| * | Update README.mdrefs/pull/1835/headGennadiy Civil2018-09-131-27/+0
| * | Update README.mdGennadiy Civil2018-09-131-29/+0
|/ /
| * Merge branch 'master' into masterJonny007-MKD2018-09-131-1/+1
| |\ | |/ |/|
* | Merge pull request #1831 from anthraxx/fix/versionGennadiy Civil2018-09-131-1/+1
|\ \
| * | version: fix declared version to be in sync with CMakeLists.txtrefs/pull/1831/headLevente Polyak2018-09-121-1/+1
* | | Merge pull request #1834 from google/9A681768AABE08D1EFA5CA77528236A4Gennadiy Civil2018-09-130-0/+0
|\ \ \ | |/ / |/| |
| * | Googletest exportrefs/pull/1834/headmisterg2018-09-131-1/+1
| * | Googletest exportmisterg2018-09-138-0/+930
| * | Googletest exportmisterg2018-09-139-931/+1
|/ /
| * Make it public again *sigh*Jonny007-MKD2018-09-132-14/+0
| * Avoid implicit move operatorJonny007-MKD2018-09-131-0/+1
| * Try to fix gcc and clang issuesJonny007-MKD2018-09-132-1/+14
| * Added special catch for std::exception in GTEST_TEST_NO_THROW_Jonny007-MKD2018-09-132-3/+29
|/
* Merge pull request #1828 from gdsotirov/patch-1Gennadiy Civil2018-09-121-1/+1
|\
| * Merge branch 'master' into patch-1refs/pull/1828/headGennadiy Civil2018-09-121-0/+1
| |\ | |/ |/|
* | Merge pull request #1829 from google/gennadiycivil-patch-1Gennadiy Civil2018-09-121-0/+1
|\ \
| * | Update appveyor.ymlrefs/pull/1829/headGennadiy Civil2018-09-121-0/+1
|/ /
| * Return GTEST_ATTRIBUTE_UNUSED_ on record_property_env to avoide comilation er...Georgi D. Sotirov2018-09-121-1/+1
|/
* Merge pull request #1827 from google/9A681768AABE08D1EFA5CA77528236A4Gennadiy Civil2018-09-110-0/+0
|\
| * Googletest exportrefs/pull/1827/headmisterg2018-09-112-12/+24
| * Googletest exportmisterg2018-09-112-24/+12
|/
* Merge pull request #1820 from Romain-Geissler/fix-gcc-misleading-indentation-...Gennadiy Civil2018-09-112-12/+24
|\
| * Fix gcc misleading indentation again.refs/pull/1820/headRomain Geissler2018-09-092-12/+24
|/
* Merge pull request #1814 from google/9A681768AABE08D1EFA5CA77528236A4Gennadiy Civil2018-09-060-0/+0
|\
| * Googletest exportrefs/pull/1814/headmisterg2018-09-061-6/+24
| * Googletest exportAbseil Team2018-09-062-53/+31
| * Googletest exportAbseil Team2018-09-062-31/+53