summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Samples changes upstreamingmisterg2017-08-072-2/+2
* Samples changes upstreamingmisterg2017-08-079-18/+15
* WIPmisterg2017-08-021-36/+20
* WIPmisterg2017-08-021-23/+15
* WIPmisterg2017-08-012-8/+13
* WIPmisterg2017-08-0113-28/+326
* Merge pull request #1167 from krizalys/fix-typoGennadiy Civil2017-07-311-1/+1
|\
| * Fixed typorefs/pull/1167/headChristophe Vidal2017-07-311-1/+1
* | Merge pull request #1165 from aninf-wo/hethi/fix-doc-linksGennadiy Civil2017-07-313-4/+4
|\ \ | |/ |/|
| * fix links to Google C++ Style Guiderefs/pull/1165/headHerbert Thielen2017-07-303-4/+4
|/
* Merge pull request #1137 from coryan/masterGennadiy Civil2017-07-264-29/+41
|\
| * More tables that did not render correctly.refs/pull/1137/headCarlos O'Ryan2017-07-024-1/+9
| * Remove silly claim that C++ lacks lambdas.Carlos O'Ryan2017-07-014-12/+12
| * Same fixes for "current" version.Carlos O'Ryan2017-07-011-4/+5
| * Fix typos too s/destoyed/destroyed/Carlos O'Ryan2017-07-013-6/+6
| * Fix table formatting.Carlos O'Ryan2017-07-013-6/+9
* | Merge pull request #1107 from lipk/patch-1Gennadiy Civil2017-07-261-1/+1
|\ \
| * | Remove unnecessary 'the'.refs/pull/1107/headlipk2017-05-301-1/+1
* | | Merge pull request #1158 from junr03/fix-linkGennadiy Civil2017-07-261-1/+1
|\ \ \
| * | | docs: fix broken linkrefs/pull/1158/headJose Nino2017-07-261-1/+1
|/ / /
* | | Merge pull request #1143 from nyibbang/patch-1Gennadiy Civil2017-07-261-1/+1
|\ \ \
| * | | Fixes a typo in FAQ.mdrefs/pull/1143/headVincent Palancher2017-07-051-1/+1
| | |/ | |/|
* | | Merge pull request #1126 from junr03/fix-broken-linkGennadiy Civil2017-07-261-1/+1
|\ \ \ | |/ / |/| |
| * | docs: fix broken link from dummies guide to cook bookrefs/pull/1126/headJose Nino2017-06-191-1/+1
* | | Merge pull request #1081 from krytarowski/netbsd-1Billy Donahue2017-06-232-2/+5
|\ \ \
| * | | Add NetBSD supportrefs/pull/1081/headKamil Rytarowski2017-05-062-2/+5
* | | | Merge pull request #1129 from Chris-Sharpe/masterBilly Donahue2017-06-231-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Colouring in help textrefs/pull/1129/headChris-Sharpe2017-06-211-1/+1
|/ / /
* | | Create gtest-internal.hBilly Donahue2017-06-111-1/+1
* | | Merge pull request #1113 from jorgehb/patch-1Billy Donahue2017-06-111-1/+1
|\ \ \ | |_|/ |/| |
| * | Fixing float comparison broken linkrefs/pull/1113/headjorgehb2017-06-081-1/+1
|/ /
* | Merge pull request #1091 from nico/wmicroBilly Donahue2017-05-231-38/+51
|\ \
| * | Fix -Wmicrosoft-cast warnings when using gtest with clang on Windows.refs/pull/1091/headNico Weber2017-05-151-38/+51
* | | Merge pull request #1096 from gennadiycivil/add-ability-for-custom-temdir-1093Billy Donahue2017-05-182-1/+7
|\ \ \
| * | | Changes add ability to overwrite TempDir(), issue https://github.com/google/g...refs/pull/1096/headGennadiy Civil2017-05-182-1/+7
|/ / /
* | | Merge pull request #1089 from nico/stdstringBilly Donahue2017-05-1627-490/+488
|\ \ \
| * | | Use std::string and ::string explicitly in gtest and gmock code.refs/pull/1089/headNico Weber2017-05-1527-490/+488
| |/ /
* | | Merge pull request #1090 from nico/typoBilly Donahue2017-05-161-1/+1
|\ \ \
| * | | Fixing typo in documentation.refs/pull/1090/headNico Weber2017-05-151-1/+1
| |/ /
* | | Merge pull request #1092 from nico/commentBilly Donahue2017-05-161-1/+1
|\ \ \ | |/ / |/| |
| * | Gender-neutralize comments in gtest.h.refs/pull/1092/headNico Weber2017-05-151-1/+1
|/ /
* | Merge pull request #725 from donhuff/xcode-headersBilly Donahue2017-05-152-0/+48
|\ \
| * | Update C++ language and library settings to match SDK projects.refs/pull/725/headDon Huff2016-03-112-0/+7
| * | Add missing headers to Xcode framework target.Don Huff2016-02-251-0/+41
* | | Merge pull request #1078 from pwnall/gtest_api_portBilly Donahue2017-05-112-1/+11
|\ \ \
| * | | Pick up GTEST_API_ definition in gtest/internal/custom/gtest-port.h.refs/pull/1078/headVictor Costan2017-05-042-1/+11
| | |/ | |/|
* | | Merge pull request #965 from davidben/format-attrBilly Donahue2017-05-072-3/+21
|\ \ \ | |/ / |/| |
| * | Annotate ColoredPrintf with the format attribute and fix bugs.refs/pull/965/headDavid Benjamin2016-12-222-3/+21
* | | Merge pull request #1034 from dankegel/masterBilly Donahue2017-05-023-2/+4
|\ \ \
| * | | Minimal changes to fix build failures on Microsoft Visual Studio 2015refs/pull/1034/headDan Kegel2017-03-023-2/+4