summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | Merge pull request #1077 from gennadiycivil/make-temp-dir-public-issue-1076Billy Donahue2017-05-025-22/+29
|\ \ \ \ | |/ / / |/| | |
| * | | Changes to make TempDir() publicrefs/pull/1077/headGennadiy Civil2017-05-025-22/+29
|/ / /
* | | Merge pull request #1029 from google/BillyDonahue-patch-3Billy Donahue2017-02-261-4/+4
|\ \ \
| * | | Remove /tree/ from Readme.md links.refs/pull/1029/headBilly Donahue2017-02-261-4/+4
|/ / /
* | | Merge pull request #996 from srz-zumix/fix-errorBilly Donahue2017-02-171-1/+1
|\ \ \
| * | | fix typo /GTEST_ATTRIBUTE_UNUSED/GTEST_ATTRIBUTE_UNUSED_/refs/pull/996/headsrz_zumix2017-02-021-1/+1
|/ / /
* | | Merge pull request #982 from mbjorge/unused-variable-fixBilly Donahue2017-01-311-3/+4
|\ \ \
| * | | Add GTEST_ATTRIBUTE_UNUSED_ to REGISTER_TYPED_TEST_CASE_Prefs/pull/982/headMike Bjorge2017-01-101-3/+4
| |/ /
* | | Merge pull request #874 from sejr/masterBilly Donahue2017-01-231-6/+6
|\ \ \ | |/ / |/| |
| * | Merge pull request #1 from google/masterrefs/pull/874/headSam Roth2017-01-238-8/+127
| |\ \ | |/ / |/| |
* | | Merge pull request #658 from audiofanatic/ExternalProject_at_configure_timeBilly Donahue2016-12-182-2/+115
|\ \ \
| * | | Added CMake configure-time download instructions to docsrefs/pull/658/headCraig Scott2016-12-172-2/+115
* | | | 2.6.4 is the minimum CMake version, so enforce it (#656)Craig Scott2016-12-183-3/+3
|/ / /
* | | Merge pull request #918 from DanAlbert/fix-android-GTEST_HAS_CLONEBilly Donahue2016-11-031-2/+6
|\ \ \
| * | | Fix detection of GTEST_HAS_CLONE for Android.refs/pull/918/headDan Albert2016-11-011-2/+6
| | |/ | |/|
* | | Merge pull request #728 from DanAlbert/tuple-stlportBilly Donahue2016-11-021-0/+2
|\ \ \
| * | | Fix a test to compile when tuple isn't available.refs/pull/728/headDan Albert2016-03-021-0/+2
| |/ /
* | | Merge pull request #876 from marco-m/patch-1Billy Donahue2016-09-211-1/+1
|\ \ \
| * | | Cookbok: fix broken relative linkrefs/pull/876/headMarco Molteni2016-09-131-1/+1
|/ / /
| | * Fixed broken linksSamuel Roth2016-09-121-1/+1
| | * blob vs treeSamuel Roth2016-09-121-1/+1
| | * Fixing relative linksSamuel Roth2016-09-121-2/+2
| | * Fixing KnownIssues and FrequentlyAskedQuestions linksSamuel Roth2016-09-121-2/+2
| | * Broken relative links fixedSamuel Roth2016-09-121-6/+6
| | * Fixing ForDummies linkSamuel Roth2016-09-121-1/+1
| | * One worksSamuel Roth2016-09-121-1/+1
| | * Relative linksSamuel Roth2016-09-121-1/+1
| | * Fixing relative linksSamuel Roth2016-09-121-1/+1
| |/ |/|
* | Merge pull request #856 from KindDragon/mingw-appveyorBilly Donahue2016-09-072-2/+2
|\ \
| * | Fix build with MinGW-w64refs/pull/856/headArkadiy Shapkin2016-09-042-2/+2
|/ /
* | Merge pull request #721 from ilmagico/fix-mingw-threadsBilly Donahue2016-08-244-5/+20
|\ \
| * | Don't use pthread when on MinGW even if availablerefs/pull/721/headDaniele Tamino2016-02-221-1/+3
| * | Fix compilation on MinGW with native threadsDaniele Tamino2016-02-223-4/+17
| |/
* | Merge pull request #821 from mazong1123/masterrelease-1.8.0Billy Donahue2016-07-141-2/+6
|\ \
| * | Reformatted the Unprintable operator== code style.refs/pull/821/headmazong11232016-07-141-1/+4