summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * Googletest exportmisterg2018-09-061-24/+6
|/
* Merge pull request #1809 from KindDragon/fix-doc-linksGennadiy Civil2018-09-0510-28/+27
|\
| * Fix doc linksrefs/pull/1809/headArkady Shapkin2018-09-0410-28/+27
|/
* Merge pull request #1801 from SoapGentoo/fix-gmock-pkgconfigGennadiy Civil2018-09-042-0/+2
|\
| * Merge branch 'master' into fix-gmock-pkgconfigrefs/pull/1801/headGennadiy Civil2018-09-049-373/+403
| |\ | |/ |/|
* | Merge pull request #1803 from KindDragon/patch-2Gennadiy Civil2018-09-048-372/+402
|\ \
| * | Update documentation to syntax highlight coderefs/pull/1803/headArkady Shapkin2018-09-038-372/+402
* | | Merge pull request #1806 from asiplas/masterGennadiy Civil2018-09-041-1/+1
|\ \ \ | |/ / |/| |
| * | Fix #1805: add `.md` to hyperlinkrefs/pull/1806/headAndrew Siplas2018-09-041-1/+1
|/ /
| * pkgconfig: Unconditionally depend on GTest when using GMockDavid Seifert2018-09-022-0/+2
|/
* Update README.mdGennadiy Civil2018-08-311-1/+1
* Merge pull request #1433 from dsacre/fix-clang-warningsrelease-1.8.1Gennadiy Civil2018-08-316-23/+443
|\
| * Merge branch 'master' into fix-clang-warningsrefs/pull/1433/headGennadiy Civil2018-08-315-44/+45
| |\ | |/ |/|
* | Merge pull request #1799 from google/9A681768AABE08D1EFA5CA77528236A4Gennadiy Civil2018-08-315-44/+45
|\ \
| * | Update googletest-output-test-golden-lin.txtrefs/pull/1799/headGennadiy Civil2018-08-311-4/+4