summaryrefslogtreecommitdiffstats
path: root/googlemock
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into isniceBrukerJWD2018-10-1699-19889/+7758
|\
| * Merge pull request #1908 from rwoldberg:masterGennadiy Civil2018-10-121-5/+6
| |\
| | * Change types to remove cast warnings.refs/pull/1908/headRobert Woldberg2018-10-121-3/+3
| |/
| * Project import generated by Copybara.Abseil Team2018-10-112-0/+347
| * Internal Changemisterg2018-10-112-347/+0
| * Remove non-variadic pre C++11 AnyOfmisterg2018-10-094-277/+16
| * Unconditionally use std::tuple.Abseil Team2018-10-0920-1373/+1297
| * Remove testing::internal::BothOfMatcher, no longer neededmisterg2018-10-091-26/+0
| * Delete CHANGESGennadiy Civil2018-10-091-126/+0
| * Fixing AllOfMatches test, where it properly belongsmisterg2018-10-081-8/+8
| * Remove non-variadic pre C++11 AllOfmisterg2018-10-084-286/+38
| * Apply clang-tidy modernize-use-nullptr to googletest.Abseil Team2018-10-0515-301/+216
| * Merge c798e39a4f96f5a985126cc3fab4738b6412cfc1 into e93da23920e5b6887d6a6a291...Matthieu2018-10-021-0/+14
| * Merge 86fe8a25eb5a6e4546f9e39cf23a5c764217bf85 into 440527a61e1c91188195f7de2...Marco Bubke2018-10-023-26/+45
| * Googletest exportmisterg2018-09-253-532/+17
| * [msys] pass big object file option to assembler for target gmock-matchers_testrefs/pull/1844/headMatthieu Longo2018-09-181-0/+3
| * Merge pull request #1837 from google/9A681768AABE08D1EFA5CA77528236A4Gennadiy Civil2018-09-142-23/+30
| |\
| | * Googletest exportrefs/pull/1837/headAbseil Team2018-09-142-23/+30
| * | Update README.mdGennadiy Civil2018-09-131-29/+0
| |/
| * Fix gcc misleading indentation again.refs/pull/1820/headRomain Geissler2018-09-092-12/+24
| * Fix doc linksrefs/pull/1809/headArkady Shapkin2018-09-046-23/+22
| * Merge branch 'master' into fix-gmock-pkgconfigrefs/pull/1801/headGennadiy Civil2018-09-045-316/+342
| |\
| | * Update documentation to syntax highlight coderefs/pull/1803/headArkady Shapkin2018-09-035-316/+342
| * | pkgconfig: Unconditionally depend on GTest when using GMockDavid Seifert2018-09-022-0/+2
| |/
| * Googletest exportmisterg2018-08-311-3/+5
| * Googletest exportmisterg2018-08-311-4/+3
| * Update gmock-matchers.hrefs/pull/1790/headGennadiy Civil2018-08-301-3/+4
| * Googletest exportAbseil Team2018-08-282-3/+4
| * Merge branch 'master' into fix-1764_CMake-errors-in-googlemockrefs/pull/1769/headGennadiy Civil2018-08-272-34/+53
| |\
| | * No longer require a functor passed to ResultOf matcher to define `result_of` ...Abseil Team2018-08-272-34/+53
| * | Use `$<INSTALL_PREFIX>` in `target_include_directories`Dakota Hawkins2018-08-241-2/+2
| |/
| * Fix #1764 Remove cmake code that leads to a configuration errorrefs/pull/1781/headWill Vining2018-08-241-21/+0
| * Install CMake export filesrefs/pull/1338/headStefano Soffia2018-08-221-65/+19
| * Improve CMake exported targets.refs/pull/1682/headDakota Hawkins2018-08-211-6/+33
| * Merge branch 'master' into josh/fix_scoped_class2refs/pull/1194/headGennadiy Civil2018-08-204-12/+31
| |\
| | * googletest exportmisterg2018-08-203-8/+17
| | * Merge branch 'master' into cleanup-cmakerefs/pull/1546/headHenry Schreiner2018-08-171-3/+3
| | |\
| | * \ Merge branch 'master' into cleanup-cmakeGennadiy Civil2018-08-1563-1557/+2600
| | |\ \
| | * \ \ Merge branch 'master' into cleanup-cmakeHenry Schreiner2018-04-0611-457/+1361
| | |\ \ \
| | * | | | Clean up cache non-advanced variable for subprojectHenry Fredrick Schreiner2018-04-051-4/+14
| * | | | | Merge branch 'master' into josh/fix_scoped_class2Gennadiy Civil2018-08-1669-2184/+5391
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | googletest exportrefs/pull/1746/headAbseil Team2018-08-151-3/+3
| | | |_|/ | | |/| |
| | * | | Merge branch 'master' into cmake-binary-dir-fixrefs/pull/1734/headGennadiy Civil2018-08-1410-17/+11
| | |\ \ \
| | | * | | more comments changesrefs/pull/1741/headGennadiy Civil2018-08-141-1/+1
| | | * | | more comments changesGennadiy Civil2018-08-142-2/+2
| | | * | | Comments changes, no functionality changes. Gennadiy Civil2018-08-148-14/+8
| | * | | | Merge branch 'master' into cmake-binary-dir-fixGennadiy Civil2018-08-1447-113/+68
| | |\ \ \ \ | | | |/ / /
| | | * | | Comments changes, no functionality changesrefs/pull/1740/headGennadiy Civil2018-08-1444-88/+44
| | | * | | Code formatting changes, clean up, no functionality changesrefs/pull/1738/headGennadiy Civil2018-08-142-12/+6
| | | * | | formatting custom/README.mdGennadiy Civil2018-08-141-1/+1