aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'github_google/master' into master-github_frosteyesClaus Stovgaard2017-04-0510-19/+139
|\
| * Merge pull request #1029 from google/BillyDonahue-patch-3Billy Donahue2017-02-251-4/+4
| |\
| | * Remove /tree/ from Readme.md links.Billy Donahue2017-02-251-4/+4
| |/
| * Merge pull request #996 from srz-zumix/fix-errorBilly Donahue2017-02-171-1/+1
| |\
| | * fix typo /GTEST_ATTRIBUTE_UNUSED/GTEST_ATTRIBUTE_UNUSED_/srz_zumix2017-02-031-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_PMike Bjorge2017-01-091-3/+4
| * | Merge pull request #874 from sejr/masterBilly Donahue2017-01-231-6/+6
| |\ \ | | |/ | |/|
| | * Merge pull request #1 from google/masterSam 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 docsCraig Scott2016-12-182-2/+115
| * | | 2.6.4 is the minimum CMake version, so enforce it (#656)Craig Scott2016-12-173-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.Dan 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.Dan Albert2016-03-021-0/+2
| | |/ /
| * | | Merge pull request #876 from marco-m/patch-1Billy Donahue2016-09-211-1/+1
| |\ \ \
| | * | | Cookbok: fix broken relative linkMarco 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-w64Arkadiy Shapkin2016-09-052-2/+2
| |/ /
* / / Moved the ignoring of *.pyc files to top level for also covering googlemock p...Claus Stovgaard2016-08-302-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 availableDaniele Tamino2016-02-221-1/+3
| * | Fix compilation on MinGW with native threadsDaniele Tamino2016-02-223-4/+17
| |/
* | Merge pull request #821 from mazong1123/masterBilly Donahue2016-07-141-2/+6
|\ \
| * | Reformatted the Unprintable operator== code style.mazong11232016-07-141-1/+4
| * | Fixed issue #775mazong11232016-07-141-2/+3
|/ /
* | Merge pull request #814 from google/BillyDonahue-patch-2Billy Donahue2016-06-281-0/+1
|\ \
| * | Add Appveyor badge to Readme.mdBilly Donahue2016-06-281-0/+1
|/ /
* | Merge pull request #723 from KindDragon/masterBilly Donahue2016-06-284-5/+88
|\ \
| * | Support running MSVC build on AppVeyourArkadiy Shapkin2016-06-274-5/+88
|/ /
* | Merge pull request #810 from google/rollback_808Billy Donahue2016-06-261-2/+2
|\ \
| * | Rollback change #808.Billy Donahue2016-06-261-2/+2
|/ /
* | Merge pull request #808 from djmott/masterBilly Donahue2016-06-261-2/+2
|\ \
| * | Fix to tests that return object which implement operator boolDavid Mott2016-06-251-2/+2
| * | fix to operator precedence in GTEST_TEST_BOOLEAN_ with expressions that imple...David Mott2016-06-251-2/+2
|/ /
* | Merge pull request #773 from mazong1123/masterBilly Donahue2016-05-158-3/+331
|\ \
| * | Added VS 2015 project support.mazong11232016-05-155-0/+328
| * | Updated the value of GTEST_DIR to reflect the googletest dir.mazong11232016-05-151-1/+1
| * | Changed the GTestDir marco value to reflect the new dir of googletest.mazong11232016-05-152-2/+2
|/ /
* | Merge pull request #741 from mbinna/patch-1Billy Donahue2016-03-161-5/+4
|\ \