summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #578 from BillyDonahue/upstream_masterBilly Donahue2015-09-011-2/+2
|\ | | | | build once
| * build oncerefs/pull/578/headBilly Donahue2015-09-011-2/+2
| |
* | Merge pull request #577 from BillyDonahue/upstream_masterBilly Donahue2015-09-012-7/+12
|\ \ | |/ | | run tests in Travis CI
| * run testsrefs/pull/577/headBilly Donahue2015-09-012-27/+13
| |\ | |/ |/|
* | Merge branch 'travis'Billy Donahue2015-09-010-0/+0
|\ \ | | | | | | | | | | | | Conflicts: travis.sh
| * | run tests in Travis CIrefs/pull/576/headBilly Donahue2015-09-011-7/+7
| | |
* | | break out test and mock in travisBilly Donahue2015-08-311-1/+1
| | |
* | | break out test and mock in travisBilly Donahue2015-08-312-9/+9
| | |
* | | cleanup travis.shBilly Donahue2015-08-311-25/+7
| | |
* | | remove unused valgrind probeBilly Donahue2015-08-311-1/+0
|/ /
| * reduce the ci matrixBilly Donahue2015-09-011-1/+1
| |
| * restore test runningBilly Donahue2015-09-011-7/+7
|/
* travis updateBilly Donahue2015-08-311-14/+9
|
* Merge branch 'master' of github.com:google/googletest into travisBilly Donahue2015-08-311-0/+2
|\
| * Update README.mdBilly Donahue2015-08-311-0/+2
| |
| * Merge pull request #575 from BillyDonahue/masterBilly Donahue2015-08-312-0/+72
| |\ | | | | | | travis continuous integration
* | \ Merge branch 'master' of github.com:BillyDonahue/googletest into travisBilly Donahue2015-08-310-0/+0
|\ \ \ | | |/ | |/|
| * | Merge pull request #1 from BillyDonahue/travisrefs/pull/575/headBilly Donahue2015-08-312-0/+72
| |\ \ | | |/ | |/| travis config
* | | travis googlemock as wellBilly Donahue2015-08-312-7/+11
| | |
* | | 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 undocrefs/pull/574/headBilly 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 Python3refs/pull/571/headSyl2015-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/masterrefs/pull/570/headNagy 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 buildrefs/pull/568/headArnaud Lacombe2015-08-271-1/+1
|/ / / /
* | | | Update README.mdBilly Donahue2015-08-261-1/+1
| | | |
| * | | readme mergingBilly Donahue2015-08-301-2/+2
| | |/ | |/|
| * | readme mergingrefs/pull/573/headBilly Donahue2015-08-303-154/+122
| | |
| * | readme mergingBilly Donahue2015-08-301-6/+2
| | |
| * | readme mergingBilly Donahue2015-08-273-102/+50
| | |
| * | readme mergingBilly Donahue2015-08-261-2/+1
| | |
| * | readme mergingBilly Donahue2015-08-263-119/+94
| |/
| * Merge remote-tracking branch 'google/master'refs/pull/572/headBilly 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/unificationrefs/pull/512/headBilly Donahue2015-08-25115-31/+65485
| |\ | | | | | | Bring GoogleMock into the GoogleTest repository
| | * 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 ↵Billy Donahue2015-08-25114-0/+65458
| | |\ | |/ / | | | | | | unification
generated by cgit v0.12 at 2024-11-07 10:50:21 (GMT)