Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | travis config | Billy Donahue | 2015-08-31 | 2 | -0/+72 |
| | |||||
* | Merge pull request #574 from BillyDonahue/undoc | Billy Donahue | 2015-08-30 | 3 | -324/+206 |
|\ | | | | | Undoc | ||||
| * | Merge branch 'master' into undoc | Billy Donahue | 2015-08-30 | 0 | -0/+0 |
| |\ | |||||
| | * | Merge branch 'BillyDonahue-undoc' | Billy Donahue | 2015-08-30 | 3 | -324/+210 |
| | |\ | |||||
| * | \ | merge | Billy Donahue | 2015-08-30 | 4 | -17/+13 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #571 from srouquette/python3 | Billy Donahue | 2015-08-30 | 1 | -7/+7 |
|\ \ \ \ | | | | | | | | | | | Fix gmock_doctor.py for Python3 | ||||
| * | | | | Fix gmock_doctor.py for Python3 | Syl | 2015-08-30 | 1 | -7/+7 |
| | | | | | |||||
* | | | | | Merge pull request #570 from Codie-Labs/master | Billy Donahue | 2015-08-30 | 1 | -4/+4 |
|\ \ \ \ \ | |/ / / / |/| | | | | xcode: project file corrected | ||||
| * | | | | Merge pull request #1 from gregory094/master | Nagy Gergő | 2015-08-29 | 1 | -4/+4 |
|/| | | | | | | | | | | | | | | xcode: project file corrected | ||||
| * | | | | xcode: project file corrected | Gregory Nagy | 2015-08-29 | 1 | -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 link | Billy Donahue | 2015-08-27 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #568 from lacombar/googlemock-build-dir | Billy Donahue | 2015-08-27 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | googlemock: change guess of googletest's relative location from ../gtest to ../googletest | ||||
| * | | | | googlemock: fix unified build | Arnaud Lacombe | 2015-08-26 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Update README.md | Billy Donahue | 2015-08-26 | 1 | -1/+1 |
| | | | | |||||
| * | | | readme merging | Billy Donahue | 2015-08-30 | 1 | -2/+2 |
| | |/ | |/| | |||||
| * | | readme merging | Billy Donahue | 2015-08-30 | 3 | -154/+122 |
| | | | |||||
| * | | readme merging | Billy Donahue | 2015-08-30 | 1 | -6/+2 |
| | | | |||||
| * | | readme merging | Billy Donahue | 2015-08-26 | 3 | -102/+50 |
| | | | |||||
| * | | readme merging | Billy Donahue | 2015-08-26 | 1 | -2/+1 |
| | | | |||||
| * | | readme merging | Billy Donahue | 2015-08-26 | 3 | -119/+94 |
| |/ | |||||
| * | Merge remote-tracking branch 'google/master' | Billy Donahue | 2015-08-26 | 314 | -428/+65882 |
| |\ | |/ |/| | |||||
* | | Update README.md | Billy Donahue | 2015-08-25 | 1 | -1/+1 |
| | | |||||
* | | Update README.md | Billy Donahue | 2015-08-25 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #512 from google/unification | Billy Donahue | 2015-08-25 | 314 | -428/+65882 |
|\ \ | |/ |/| | Unify googlemock into googletest | ||||
| * | Merge pull request #511 from BillyDonahue/unification | Billy Donahue | 2015-08-25 | 115 | -31/+65485 |
| |\ | | | | | | | Bring GoogleMock into the GoogleTest repository | ||||
| | * | tiny fix | Billy Donahue | 2015-08-25 | 1 | -5/+6 |
| | | | |||||
| | * | unified project home | Billy Donahue | 2015-08-25 | 1 | -58/+62 |
| | | | |||||
| | * | cat _home.md files into README.md | Billy Donahue | 2015-08-25 | 2 | -41/+32 |
| | | | |||||
| | * | move ProjectHome files into root | Billy Donahue | 2015-08-25 | 2 | -0/+0 |
| | | | |||||
| | * | Merge branch 'unification' of github.com:BillyDonahue/googlemock into ↵ | Billy Donahue | 2015-08-25 | 114 | -0/+65458 |
| |/| | | | | | | | | | | unification | ||||
| | * | move googlemock files into googlemock/ subdir | Billy Donahue | 2015-08-25 | 114 | -0/+0 |
| | | | |||||
| | * | Merge remote-tracking branch 'google/master' | Billy Donahue | 2015-08-25 | 25 | -88/+20752 |
| | |\ | |||||
| | | * | Merge pull request #182 from BillyDonahue/wiki | Billy Donahue | 2015-08-25 | 15 | -0/+0 |
| | | |\ | | | | | | | | | | | move versioned docs to version directories | ||||
| | | | * | move versioned docs to version directories | Billy Donahue | 2015-08-25 | 15 | -0/+0 |
| | | | | | |||||
| | | * | | Merge pull request #180 from google/wiki | Billy Donahue | 2015-08-25 | 25 | -88/+20752 |
| | |/| | | | | | | | | | | | | merge wiki branch into master | ||||
| | | * | | Merge pull request #179 from BillyDonahue/wiki | Billy Donahue | 2015-08-25 | 114 | -0/+44775 |
| | | |\| | | | | | | | | | | | Catch up with doc fixes from false-start repo | ||||
| | | | * | readme.md updates | Billy Donahue | 2015-08-25 | 1 | -88/+69 |
| | | | | | |||||
| | | | * | README -> README.md | Billy Donahue | 2015-08-25 | 1 | -0/+0 |
| | | | | | |||||
| | | | * | move CheatSheet.md into docs | Billy Donahue | 2015-08-25 | 1 | -0/+0 |
| | | | | | |||||
| | | | * | Move all .md files from wiki into docs/ dir. | Billy Donahue | 2015-08-25 | 23 | -0/+0 |
| | | | | | |||||
| | | | * | Merge branch 'wiki' of github.com:BillyDonahue/googlemock into wiki | Billy Donahue | 2015-08-25 | 24 | -0/+20683 |
| | | |/| | | |/|/ | |||||
| | | * | Migrating wiki contents from Google Code | Google Code Exporter | 2015-08-24 | 24 | -0/+20683 |
| | | | |||||
| | * | Rename custom/callback-actions.h[.pump] => | kosak | 2015-07-28 | 6 | -16/+16 |
| | | | | | | | | | | | | custom/gmock-generated-actions.h[.pump]. | ||||
| | * | Injection point for GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_ | kosak | 2015-07-28 | 1 | -0/+5 |
| | | | |||||
| | * | Inject a mock stack trace getter. | kosak | 2015-07-28 | 1 | -10/+42 |
| | | | |||||
| | * | Add an injection point for customizing GMOCK_DECLARE_bool and the like. | kosak | 2015-07-28 | 2 | -0/+51 |
| | | | |||||
| | * | Tests based on GTEST_HAS_STD_UNIQUE_PTR_ and GTEST_HAS_STD_SHARED_PTR_. | kosak | 2015-07-27 | 1 | -0/+18 |
| | | | | | | | | | | | | Pull in gtest 744. | ||||
| | * | Inject customization point for gmock-matchers.h | kosak | 2015-07-27 | 2 | -1/+43 |
| | | | |||||
| | * | Templatize ParseeGoogleMockStringFlag on String type. | kosak | 2015-07-27 | 1 | -1/+2 |
| | | | |||||
| | * | Missing diff that should have gone along with the pull of gtest 738. | kosak | 2015-07-27 | 1 | -39/+0 |
| | | |