aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | travis fixBilly Donahue2015-08-311-1/+3
| |/ |/|
* | travis configBilly Donahue2015-08-312-0/+72
|/
* Merge pull request #574 from BillyDonahue/undocBilly Donahue2015-08-303-324/+206
|\ | | | | Undoc
| * Merge branch 'master' into undocBilly Donahue2015-08-300-0/+0
| |\
| | * Merge branch 'BillyDonahue-undoc'Billy Donahue2015-08-303-324/+210
| | |\
| * | \ mergeBilly Donahue2015-08-304-17/+13
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #571 from srouquette/python3Billy Donahue2015-08-301-7/+7
|\ \ \ \ | | | | | | | | | | Fix gmock_doctor.py for Python3
| * | | | Fix gmock_doctor.py for Python3Syl2015-08-301-7/+7
| | | | |
* | | | | Merge pull request #570 from Codie-Labs/masterBilly Donahue2015-08-301-4/+4
|\ \ \ \ \ | |/ / / / |/| | | | xcode: project file corrected
| * | | | Merge pull request #1 from gregory094/masterNagy Gergő2015-08-291-4/+4
|/| | | | | | | | | | | | | | xcode: project file corrected
| * | | | xcode: project file correctedGregory Nagy2015-08-291-4/+4
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Project file contained the 'README' instead of 'README.md' that's why the build failed with the fact that it can't copy this file for its proper location. Signed-off-by: Gergő Nagy <gergo@getcodie.com>
* | | | fix a linkBilly Donahue2015-08-271-1/+1
| | | |
* | | | Merge pull request #568 from lacombar/googlemock-build-dirBilly Donahue2015-08-271-1/+1
|\ \ \ \ | | | | | | | | | | googlemock: change guess of googletest's relative location from ../gtest to ../googletest
| * | | | googlemock: fix unified buildArnaud Lacombe2015-08-261-1/+1
|/ / / /
* | | | Update README.mdBilly Donahue2015-08-261-1/+1
| | | |
| * | | readme mergingBilly Donahue2015-08-301-2/+2
| | |/ | |/|
| * | readme mergingBilly Donahue2015-08-303-154/+122
| | |
| * | readme mergingBilly Donahue2015-08-301-6/+2
| | |
| * | readme mergingBilly Donahue2015-08-263-102/+50
| | |
| * | readme mergingBilly Donahue2015-08-261-2/+1
| | |
| * | readme mergingBilly Donahue2015-08-263-119/+94
| |/
| * Merge remote-tracking branch 'google/master'Billy Donahue2015-08-26314-428/+65882
| |\ | |/ |/|
* | 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
|\ \ | |/ |/| Unify googlemock into googletest
| * Merge pull request #511 from BillyDonahue/unificationBilly Donahue2015-08-25115-31/+65485
| |\ | | | | | | Bring GoogleMock into the GoogleTest repository
| | * tiny fixBilly 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 ↵Billy Donahue2015-08-25114-0/+65458
| |/| | | | | | | | | | unification
| | * 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 directories
| | | | * move versioned docs to version directoriesBilly Donahue2015-08-2515-0/+0
| | | | |
| | | * | Merge pull request #180 from google/wikiBilly Donahue2015-08-2525-88/+20752
| | |/| | | | | | | | | | | | merge wiki branch into master
| | | * | Merge pull request #179 from BillyDonahue/wikiBilly Donahue2015-08-25114-0/+44775
| | | |\| | | | | | | | | | | Catch up with doc fixes from false-start repo
| | | | * 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
| | | | | | | | | | | | custom/gmock-generated-actions.h[.pump].
| | * 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
| | | | | | | | | | | | Pull in gtest 744.
| | * Inject customization point for gmock-matchers.hkosak2015-07-272-1/+43
| | |
| | * Templatize ParseeGoogleMockStringFlag on String type.kosak2015-07-271-1/+2
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-16 16:36:04 +0000