summaryrefslogtreecommitdiffstats
path: root/googlemock/include/gmock
Commit message (Expand)AuthorAgeFilesLines
* 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
|/
* mergingGennadiy Civil2018-04-111-17/+73
* Upstream cl/192179348Gennadiy Civil2018-04-111-2/+4
* ..and this should be itrefs/pull/1558/headGennadiy Civil2018-04-111-1/+15
* mergeGennadiy Civil2018-04-103-96/+18
|\
| * Revert "gmock actions 2"refs/pull/1556/headGennadiy Civil2018-04-108-105/+25
| * yet moreGennadiy Civil2018-04-091-1/+1
| * continuedGennadiy Civil2018-04-094-6/+8
* | RE-Doing the merge, this time with gcc on mac in the PR so I can catch errors...Gennadiy Civil2018-04-105-77/+310
|/
* Merge branch 'master' of github.com:google/googletestGennadiy Civil2018-04-091-30/+60
|\
| * Sync gmock-generated-nice-strict.h.pump with gmock-generated-nice-strict.h.refs/pull/1552/headVictor Costan2018-04-071-30/+60
* | linkage, fixing MSVCGennadiy Civil2018-04-061-1/+1
* | fixing MSVCGennadiy Civil2018-04-061-0/+2
* | warningsGennadiy Civil2018-04-061-1/+2
* | cont - 2Gennadiy Civil2018-04-061-1/+1
* | contGennadiy Civil2018-04-061-1/+1
* | more warningsGennadiy Civil2018-04-061-1/+1