| Commit message (Expand) | Author | Age | Files | Lines |
* | Reverting some changes, need to make the merge compile | Gennadiy Civil | 2018-01-15 | 1 | -1/+1 |
* | Reverting some changes, need to make the merge compile | Gennadiy Civil | 2018-01-15 | 1 | -2/+3 |
* | Reverting some changes, need to make the merge compile | Gennadiy Civil | 2018-01-15 | 1 | -1/+0 |
* | Reverting some changes, need to make the merge compile | Gennadiy Civil | 2018-01-15 | 2 | -53/+12 |
* | Test files for corresponding changes | Gennadiy Civil | 2018-01-15 | 1 | -0/+2 |
* | Test files for corresponding changes | Gennadiy Civil | 2018-01-15 | 1 | -6/+9 |
* | Test files for corresponding changes | Gennadiy Civil | 2018-01-15 | 1 | -5/+25 |
* | Test files for corresponding changes | Gennadiy Civil | 2018-01-15 | 1 | -0/+13 |
* | Merge branch 'master' of github.com:gennadiycivil/googletest | Gennadiy Civil | 2018-01-15 | 0 | -0/+0 |
|\ |
|
| * | Merge branch 'master' into master | Gennadiy Civil | 2018-01-15 | 1 | -23/+40 |
| |\ |
|
* | | | More code merges | Gennadiy Civil | 2018-01-15 | 1 | -18/+15 |
* | | | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-01-15 | 1 | -23/+40 |
|\ \ \
| |/ /
|/| /
| |/ |
|
| * | Merge pull request #1339 from Romain-Geissler/fix-core-dump-shared | Gennadiy Civil | 2018-01-15 | 1 | -23/+40 |
| |\ |
|
| | * | Merge branch 'master' into fix-core-dump-shared | Gennadiy Civil | 2018-01-13 | 22 | -154/+180 |
| | |\
| | |/
| |/| |
|
| * | | Merge pull request #1400 from gennadiycivil/master | Gennadiy Civil | 2018-01-12 | 1 | -4/+4 |
| |\ \ |
|
| | | * | Merge branch 'master' into fix-core-dump-shared | Gennadiy Civil | 2018-01-09 | 70 | -772/+860 |
| | | |\ |
|
| | | * \ | Merge branch 'master' into fix-core-dump-shared | Gennadiy Civil | 2017-12-08 | 5 | -2/+12 |
| | | |\ \ |
|
| | | * | | | Fix double free when building Gtest/GMock in shared libraries and linking a t... | Romain Geissler | 2017-12-02 | 1 | -23/+40 |
* | | | | | | Code merging | Gennadiy Civil | 2018-01-15 | 2 | -8/+16 |
| |/ / / /
|/| | | | |
|
* | | | | | continue upstream/merge, etc | Gennadiy Civil | 2018-01-11 | 1 | -4/+4 |
* | | | | | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-01-11 | 1 | -2/+2 |
|\| | | | |
|
| * | | | | Update .travis.yml | Gennadiy Civil | 2018-01-11 | 1 | -2/+0 |
| * | | | | Update .travis.yml | Gennadiy Civil | 2018-01-11 | 1 | -2/+2 |
| * | | | | Update .travis.yml | Gennadiy Civil | 2018-01-11 | 1 | -0/+2 |
| * | | | | Update .travis.yml | Gennadiy Civil | 2018-01-11 | 1 | -4/+0 |
| * | | | | Merge pull request #1399 from gennadiycivil/master | Gennadiy Civil | 2018-01-11 | 3 | -7/+33 |
| |\ \ \ \ |
|
* | | | | | | Trying to fix travis | Gennadiy Civil | 2018-01-11 | 1 | -4/+0 |
| |/ / / /
|/| | | | |
|
* | | | | | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-01-11 | 0 | -0/+0 |
|\| | | | |
|
| * | | | | Merge pull request #1398 from gennadiycivil/master | Gennadiy Civil | 2018-01-11 | 2 | -7/+4 |
| |\ \ \ \ |
|
* | | | | | | Upstream cl 103120214 | Gennadiy Civil | 2018-01-11 | 3 | -7/+33 |
| |/ / / /
|/| | | | |
|
* | | | | | More merge, cleanup | Gennadiy Civil | 2018-01-10 | 1 | -1/+1 |
* | | | | | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-01-10 | 0 | -0/+0 |
|\| | | | |
|
| * | | | | Merge pull request #1397 from gennadiycivil/master | Gennadiy Civil | 2018-01-10 | 5 | -59/+62 |
| |\ \ \ \ |
|
* | | | | | | More merge, cleanup | Gennadiy Civil | 2018-01-10 | 2 | -8/+5 |
| |/ / / /
|/| | | | |
|
* | | | | | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-01-10 | 0 | -0/+0 |
|\| | | | |
|
| * | | | | Merge pull request #1396 from gennadiycivil/master | Gennadiy Civil | 2018-01-10 | 2 | -3/+3 |
| |\ \ \ \ |
|
| * \ \ \ \ | Merge pull request #1395 from gennadiycivil/master | Gennadiy Civil | 2018-01-10 | 4 | -17/+13 |
| |\ \ \ \ \ |
|
* | | | | | | | Code merge, upstreaming accumulated changes, cleanup | Gennadiy Civil | 2018-01-10 | 5 | -59/+62 |
| |_|/ / / /
|/| | | | | |
|
* | | | | | | revert | Gennadiy Civil | 2018-01-10 | 1 | -68/+9 |
* | | | | | | code merges, cleanup | Gennadiy Civil | 2018-01-10 | 3 | -12/+71 |
| |/ / / /
|/| | | | |
|
* | | | | | revert googletest/test/gtest-param-test_test.cc | Gennadiy Civil | 2018-01-10 | 1 | -46/+3 |
* | | | | | Merge branch 'master' of github.com:gennadiycivil/googletest | Gennadiy Civil | 2018-01-10 | 0 | -0/+0 |
|\ \ \ \ \ |
|
| * | | | | | Merge branch 'master' into master | Gennadiy Civil | 2018-01-10 | 1 | -0/+6 |
| |\| | | | |
|
* | | | | | | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-01-10 | 1 | -0/+6 |
|\ \ \ \ \ \
| |/ / / / /
|/| / / / /
| |/ / / / |
|
| * | | | | Update .travis.yml | Gennadiy Civil | 2018-01-10 | 1 | -0/+6 |
* | | | | | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-01-09 | 0 | -0/+0 |
|\| | | | |
|
| * | | | | Merge pull request #1394 from gennadiycivil/master | Gennadiy Civil | 2018-01-09 | 4 | -51/+51 |
| |\ \ \ \ |
|
* | | | | | | code merge, cleanups | Gennadiy Civil | 2018-01-09 | 5 | -20/+59 |
| |/ / / /
|/| | | | |
|
* | | | | | Upstream of cl 129104714 | Gennadiy Civil | 2018-01-09 | 2 | -49/+50 |
* | | | | | Revert one file | Gennadiy Civil | 2018-01-09 | 1 | -2/+3 |