summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|/ /
* | 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
| * | Fixed issue #775mazong11232016-07-141-2/+3
|/ /
* | Merge pull request #814 from google/BillyDonahue-patch-2Billy Donahue2016-06-291-0/+1
|\ \
| * | Add Appveyor badge to Readme.mdrefs/pull/927/headrefs/pull/814/headBilly Donahue2016-06-291-0/+1
|/ /
* | Merge pull request #723 from KindDragon/masterBilly Donahue2016-06-284-5/+88
|\ \
| * | Support running MSVC build on AppVeyourrefs/pull/723/headArkadiy Shapkin2016-06-274-5/+88
|/ /
* | Merge pull request #810 from google/rollback_808Billy Donahue2016-06-261-2/+2
|\ \
| * | Rollback change #808.refs/pull/810/headBilly 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 boolrefs/pull/808/headDavid 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.refs/pull/773/headmazong11232016-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
|\ \
| * | Fix whitespace in paragraphrefs/pull/741/headManuel Binna2016-03-161-5/+4
|/ /
* | Merge pull request #724 from duggelz/masterBilly Donahue2016-03-153-5/+38
|\ \
| * | Restructure test so each scenario is independent.refs/pull/724/headDoug Greiman2016-03-021-20/+13
| * | Fix env_var_test to ignore XML_OUTPUT_FILE if already setDoug Greiman2016-03-021-0/+2
| * | Restructure $XML_OUTPUT_FILE logicDoug Greiman2016-02-264-26/+32
| * | Fix inconsistent styleDoug Greiman2016-02-261-1/+1
| * | Read Bazel's $XML_OUTPUT_FILE environment variableDoug Greiman2016-02-244-2/+34
* | | Merge pull request #735 from phad/patch-1Billy Donahue2016-03-081-1/+1
|\ \ \
| * | | Fix typo (Inovke -> Invoke)refs/pull/735/headPaul Hadfield2016-03-081-1/+1
|/ / /
* | | Merge pull request #731 from mattrajca/patch-1Billy Donahue2016-03-051-1/+1
|\ \ \ | |_|/ |/| |
| * | Fixed typo ('XCode' -> 'Xcode')refs/pull/731/headMatt Rajca2016-03-041-1/+1
|/ /
* | Merge pull request #719 from paul-wilkinson/docs_formatting_fixBilly Donahue2016-02-2212-17/+17
|\ \
| * | Fix formatting in AdvancedGuide.mdrefs/pull/719/headPaul Wilkinson2016-02-2112-17/+17
|/ /
* | Merge pull request #713 from DarthGandalf/expectBilly Donahue2016-02-177-293/+290
|\ \
| * | Change error message of EXPECT_EQ to treat lhs and rhs equivalently.refs/pull/713/headAlexey Sokolov2016-02-167-293/+290
| |/
* | Merge pull request #715 from jacob-meacham/bugfix/expect-callBilly Donahue2016-02-173-8/+8
|\ \
| * | Fix link that's returned when running tests. #714refs/pull/715/headJacob Meacham2016-02-173-8/+8
| |/
* | Merge pull request #716 from jacob-meacham/feature/gitignoreBilly Donahue2016-02-172-0/+4
|\ \ | |/ |/|
| * Add build artifacts to git ignore.refs/pull/716/headJacob Meacham2016-02-172-0/+4
|/
* Merge pull request #688 from tamland/python3Billy Donahue2016-02-019-29/+36
|\
| * add python 3 support to fuse_gtest_files scriptrefs/pull/688/headThomas Amland2016-01-191-15/+18