summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* xcode: project file correctedGregory Nagy2015-08-291-4/+4
* fix a linkBilly Donahue2015-08-271-1/+1
* Merge pull request #568 from lacombar/googlemock-build-dirBilly Donahue2015-08-271-1/+1
|\
| * googlemock: fix unified buildrefs/pull/568/headArnaud Lacombe2015-08-271-1/+1
|/
* Update README.mdBilly Donahue2015-08-261-1/+1
* Update README.mdBilly Donahue2015-08-251-1/+1
* Update README.mdBilly Donahue2015-08-251-2/+2
* Merge pull request #512 from google/unificationBilly Donahue2015-08-25314-428/+65882
|\
| * Merge pull request #511 from BillyDonahue/unificationrefs/pull/512/headBilly Donahue2015-08-25115-31/+65485
| |\
| | * tiny fixrefs/pull/511/headBilly Donahue2015-08-251-5/+6
| | * unified project homeBilly Donahue2015-08-251-58/+62
| | * cat _home.md files into README.mdBilly Donahue2015-08-252-41/+32
| | * move ProjectHome files into rootBilly Donahue2015-08-252-0/+0
| | * Merge branch 'unification' of github.com:BillyDonahue/googlemock into unifica...Billy Donahue2015-08-25114-0/+65458
| | |\ | |/ /
| | * move googlemock files into googlemock/ subdirBilly Donahue2015-08-25114-0/+0
| | * Merge remote-tracking branch 'google/master'Billy Donahue2015-08-2525-88/+20752
| | |\
| | | * Merge pull request #182 from BillyDonahue/wikiBilly Donahue2015-08-2515-0/+0
| | | |\
| | | | * move versioned docs to version directoriesBilly Donahue2015-08-2515-0/+0
| | | * | Merge pull request #180 from google/wikiBilly Donahue2015-08-2525-88/+20752
| | | |\ \ | | |/ / /
| | | * | Merge pull request #179 from BillyDonahue/wikiBilly Donahue2015-08-25114-0/+44775
| | | |\ \ | | | | |/
| | | | * readme.md updatesBilly Donahue2015-08-251-88/+69
| | | | * README -> README.mdBilly Donahue2015-08-251-0/+0
| | | | * move CheatSheet.md into docsBilly Donahue2015-08-251-0/+0
| | | | * Move all .md files from wiki into docs/ dir.Billy Donahue2015-08-2523-0/+0
| | | | * Merge branch 'wiki' of github.com:BillyDonahue/googlemock into wikiBilly Donahue2015-08-2524-0/+20683
| | | | |\ | | | |/ / | | |/| / | | | |/
| | | * Migrating wiki contents from Google CodeGoogle Code Exporter2015-08-2424-0/+20683
| | * Rename custom/callback-actions.h[.pump] =>kosak2015-07-286-16/+16
| | * Injection point for GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_kosak2015-07-281-0/+5
| | * Inject a mock stack trace getter.kosak2015-07-281-10/+42
| | * Add an injection point for customizing GMOCK_DECLARE_bool and the like.kosak2015-07-282-0/+51
| | * Tests based on GTEST_HAS_STD_UNIQUE_PTR_ and GTEST_HAS_STD_SHARED_PTR_.kosak2015-07-271-0/+18
| | * Inject customization point for gmock-matchers.hkosak2015-07-272-1/+43
| | * Templatize ParseeGoogleMockStringFlag on String type.kosak2015-07-271-1/+2
| | * Missing diff that should have gone along with the pull of gtest 738.kosak2015-07-271-39/+0
| | * Explicitly specify return value for lambda in AsStdFunction() to ensure itkosak2015-07-243-12/+22
| | * Remove some tests.kosak2015-07-191-19/+2
| | * Move Callback-related generated actions to a custom/ file.kosak2015-07-195-169/+166
| | * Mark the default constructor of Matcher<> explicit.kosak2015-07-131-1/+1
| | * Fix EXPECT_THAT() to support literal strings as a second argument.kosak2015-04-282-3/+19
| | * Change IsNull and NotNull to use ==/!= nullptr in C++11.kosak2015-04-283-1/+27
| | * Suppresses the stack trace in a warning for uninteresting call by default; th...kosak2015-02-143-13/+27
| | * In C++11 and above, makes a mock method whose return type is defaultkosak2015-02-144-72/+150
| | * This change adds an explicit invocation of std::move to workaround a problemkosak2015-02-141-0/+7
| | * Make ReturnNull() support unique_ptr and shared_ptr.kosak2015-01-082-1/+19
| | * Adding support to gmock_gen for nested templates.kosak2015-01-083-4/+41
| | * Makes DoubleNear() print the diff between the actual and the expected value w...kosak2015-01-083-37/+73
| | * Add support for C++11 explicitly defaulted and deleted special member functio...kosak2014-11-172-4/+73
| | * Prevent gmock_gen from returning exit code zero on a failure to parse.kosak2014-11-171-1/+1
| | * Handle parameters without variable names when the type includes *, & or [].kosak2014-11-172-4/+33
| | * Update gmock_doctor to accept static_assert output.kosak2014-11-171-0/+9