summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2083 from hugolm84/v1.8.xrefs/pull/4095/headrefs/pull/1871/headv1.8.xGennadiy Civil2019-01-302-2/+13
|\
| * Merge pull request #2086 from hugolm84:fix-dynamic/static-runtime-linkrefs/pull/2083/headGennadiy Civil2019-01-291-0/+2
| * Update WORKSPACE to make bazel work againGennadiy Civil2019-01-251-0/+2
| * Merge branch 'fix-compile-on-wec2013' into v1.8.xHugo Lindström2019-01-251-2/+11
| |\
| | * Add missing typedefs for WINCE800 (Windows Embedded Compact 2013).refs/pull/2081/headHugo Lindström2019-01-251-2/+11
* | | Merge pull request #2085 from LukeCz/patch-2Gennadiy Civil2019-01-281-1/+1
|\ \ \
| * | | Fix for: failed build on centos6 master #1587refs/pull/2085/headLukasz Czajczyk2019-01-271-1/+1
|/ / /
* | | Update WORKSPACE to make bazel work againGennadiy Civil2019-01-251-0/+2
|/ /
* | Merge pull request #1858 from SoapGentoo/v1.8.xrefs/pull/1932/headGennadiy Civil2018-10-042-2/+2
|\ \
| * | Use correct minor version for 1.8 branchrefs/pull/1858/headDavid Seifert2018-09-262-2/+2
|/ /
* | Merge branch 'master' into v1.8.xGennadiy Civil2018-09-133-2/+3
|\ \
| * \ 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
| |/ /
| * | 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 #1817 from DavidSchuldenfrei/1.8.x/bugFix/CompileVS2013Gennadiy Civil2018-09-132-1/+11
|\ \ \ | |/ / |/| |
| * | Gennadiy's comment. Reverts to previous code if not using Visual Studio 2013refs/pull/1817/headDavid Schuldenfrei2018-09-121-0/+4
| * | Fix Compile error, and warning in Visaul Studio 2013David Schuldenfrei2018-09-082-2/+8
* | | 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
| * | Update googletest-output-test-golden-lin.txtGennadiy Civil2018-08-311-10/+10