summaryrefslogtreecommitdiffstats
path: root/googlemock/include
Commit message (Expand)AuthorAgeFilesLines
...
| * Merge branch 'master' into isniceBrukerJWD2018-10-1624-2536/+3350
| |\
| * | Added Mock::IsNaggy, IsNice, and IsStrictJonathan Wendeborn2018-10-161-0/+10
* | | Googletest exportAbseil Team2018-10-189-413/+341
| |/ |/|
* | 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
|/ /
* | Remove non-variadic pre C++11 AnyOfmisterg2018-10-093-251/+0
* | Unconditionally use std::tuple.Abseil Team2018-10-0912-933/+887
* | Remove testing::internal::BothOfMatcher, no longer neededmisterg2018-10-091-26/+0
* | Remove non-variadic pre C++11 AllOfmisterg2018-10-083-228/+1
* | Apply clang-tidy modernize-use-nullptr to googletest.Abseil Team2018-10-053-50/+47
* | Merge 86fe8a25eb5a6e4546f9e39cf23a5c764217bf85 into 440527a61e1c91188195f7de2...Marco Bubke2018-10-022-26/+34
* | Googletest exportmisterg2018-09-253-532/+17
* | Googletest exportrefs/pull/1837/headAbseil Team2018-09-141-13/+1
* | Fix gcc misleading indentation again.refs/pull/1820/headRomain Geissler2018-09-092-12/+24
* | 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
* | No longer require a functor passed to ResultOf matcher to define `result_of` ...Abseil Team2018-08-271-34/+35
* | googletest exportmisterg2018-08-203-8/+17
* | googletest exportrefs/pull/1746/headAbseil Team2018-08-151-3/+3
* | Comments changes, no functionality changes. Gennadiy Civil2018-08-143-6/+6
* | Comments changes, no functionality changesrefs/pull/1740/headGennadiy Civil2018-08-1417-34/+17
* | 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
* | formatting for new READMEsGennadiy Civil2018-08-131-6/+6
* | Move instructions into custom/README filesGennadiy Civil2018-08-133-13/+18
* | comment cleanuprefs/pull/1732/headGennadiy Civil2018-08-131-2/+0
* | Formatting changes for automatic code managementGennadiy Civil2018-07-2723-1/+47
* | Merge branch 'master' into feature/fix-build-error-vs2017-win10-jpMasaru Tsuchiyama2018-07-213-23/+41
|\ \
| * | code mergerefs/pull/1676/headGennadiy Civil2018-07-201-0/+14
| * | Merge branch 'master' into googletest_for_asamrefs/pull/1668/headduxiuxing2018-07-191-4/+8
| |\ \
| | * | code syncGennadiy Civil2018-07-191-4/+8
| * | | Replace "…" with "..."(three dots) to fix warning C4819 in Visual Studio杜修杏2018-07-191-2/+2
| * | | Merge branch 'master' into googletest_for_asamduxiuxing2018-07-191-1/+1
| |\ \ \ | | |/ /
| * | | Fix warning C4819: The file contains a character that cannot be represented i...duxiuxing2018-07-173-21/+21
* | | | Merge branch 'master' into feature/fix-build-error-vs2017-win10-jpMasaru Tsuchiyama2018-07-181-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Formatting and a linkGennadiy Civil2018-07-181-1/+1
| |/ /
* | | This closes #1595: fix compiler error with Visual Studio 2017 on Win10 JP.Masaru Tsuchiyama2018-06-302-8/+8
|/ /
* | Fix gmock not building when -fno-rttiScott Graham2018-05-021-4/+4
* | merging, Gennadiy Civil2018-04-255-480/+803
* | 193353312Gennadiy Civil2018-04-181-4/+7
* | http://cl/193060888Gennadiy Civil2018-04-171-5/+13
* | test-meergingGennadiy Civil2018-04-162-34/+6
* | merging gmock generated matchersGennadiy Civil2018-04-162-264/+367
* | merging refs/pull/1567/headGennadiy Civil2018-04-122-0/+20
* | merging refs/pull/1566/headGennadiy Civil2018-04-121-18/+14
* | Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-04-123-210/+203
|\ \
| * | Remove multiple inheritance from "unintesting call" mock classes.refs/pull/1557/headVictor Costan2018-04-123-210/+203
* | | small cleanupGennadiy Civil2018-04-121-0/+8
|/ /