aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Reverting some changes, need to make the merge compileGennadiy Civil2018-01-151-1/+1
* Reverting some changes, need to make the merge compileGennadiy Civil2018-01-151-2/+3
* Reverting some changes, need to make the merge compileGennadiy Civil2018-01-151-1/+0
* Reverting some changes, need to make the merge compileGennadiy Civil2018-01-152-53/+12
* Test files for corresponding changesGennadiy Civil2018-01-151-0/+2
* Test files for corresponding changesGennadiy Civil2018-01-151-6/+9
* Test files for corresponding changesGennadiy Civil2018-01-151-5/+25
* Test files for corresponding changesGennadiy Civil2018-01-151-0/+13
* Merge branch 'master' of github.com:gennadiycivil/googletestGennadiy Civil2018-01-150-0/+0
|\
| * Merge branch 'master' into masterGennadiy Civil2018-01-151-23/+40
| |\
* | | More code mergesGennadiy Civil2018-01-151-18/+15
* | | Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-01-151-23/+40
|\ \ \ | |/ / |/| / | |/
| * Merge pull request #1339 from Romain-Geissler/fix-core-dump-sharedGennadiy Civil2018-01-151-23/+40
| |\
| | * Merge branch 'master' into fix-core-dump-sharedGennadiy Civil2018-01-1322-154/+180
| | |\ | | |/ | |/|
| * | Merge pull request #1400 from gennadiycivil/masterGennadiy Civil2018-01-121-4/+4
| |\ \
| | | * Merge branch 'master' into fix-core-dump-sharedGennadiy Civil2018-01-0970-772/+860
| | | |\
| | | * \ Merge branch 'master' into fix-core-dump-sharedGennadiy Civil2017-12-085-2/+12
| | | |\ \
| | | * | | Fix double free when building Gtest/GMock in shared libraries and linking a t...Romain Geissler2017-12-021-23/+40
* | | | | | Code mergingGennadiy Civil2018-01-152-8/+16
| |/ / / / |/| | | |
* | | | | continue upstream/merge, etcGennadiy Civil2018-01-111-4/+4
* | | | | Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-01-111-2/+2
|\| | | |
| * | | | Update .travis.ymlGennadiy Civil2018-01-111-2/+0
| * | | | Update .travis.ymlGennadiy Civil2018-01-111-2/+2
| * | | | Update .travis.ymlGennadiy Civil2018-01-111-0/+2
| * | | | Update .travis.ymlGennadiy Civil2018-01-111-4/+0
| * | | | Merge pull request #1399 from gennadiycivil/masterGennadiy Civil2018-01-113-7/+33
| |\ \ \ \
* | | | | | Trying to fix travisGennadiy Civil2018-01-111-4/+0
| |/ / / / |/| | | |
* | | | | Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-01-110-0/+0
|\| | | |
| * | | | Merge pull request #1398 from gennadiycivil/masterGennadiy Civil2018-01-112-7/+4
| |\ \ \ \
* | | | | | Upstream cl 103120214Gennadiy Civil2018-01-113-7/+33
| |/ / / / |/| | | |
* | | | | More merge, cleanupGennadiy Civil2018-01-101-1/+1
* | | | | Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-01-100-0/+0
|\| | | |
| * | | | Merge pull request #1397 from gennadiycivil/masterGennadiy Civil2018-01-105-59/+62
| |\ \ \ \
* | | | | | More merge, cleanupGennadiy Civil2018-01-102-8/+5
| |/ / / / |/| | | |
* | | | | Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-01-100-0/+0
|\| | | |
| * | | | Merge pull request #1396 from gennadiycivil/masterGennadiy Civil2018-01-102-3/+3
| |\ \ \ \
| * \ \ \ \ Merge pull request #1395 from gennadiycivil/masterGennadiy Civil2018-01-104-17/+13
| |\ \ \ \ \
* | | | | | | Code merge, upstreaming accumulated changes, cleanupGennadiy Civil2018-01-105-59/+62
| |_|/ / / / |/| | | | |
* | | | | | revertGennadiy Civil2018-01-101-68/+9
* | | | | | code merges, cleanupGennadiy Civil2018-01-103-12/+71
| |/ / / / |/| | | |
* | | | | revert googletest/test/gtest-param-test_test.ccGennadiy Civil2018-01-101-46/+3
* | | | | Merge branch 'master' of github.com:gennadiycivil/googletestGennadiy Civil2018-01-100-0/+0
|\ \ \ \ \
| * | | | | Merge branch 'master' into masterGennadiy Civil2018-01-101-0/+6
| |\| | | |
* | | | | | Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-01-101-0/+6
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Update .travis.ymlGennadiy Civil2018-01-101-0/+6
* | | | | Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-01-090-0/+0
|\| | | |
| * | | | Merge pull request #1394 from gennadiycivil/masterGennadiy Civil2018-01-094-51/+51
| |\ \ \ \
* | | | | | code merge, cleanupsGennadiy Civil2018-01-095-20/+59
| |/ / / / |/| | | |
* | | | | Upstream of cl 129104714Gennadiy Civil2018-01-092-49/+50
* | | | | Revert one fileGennadiy Civil2018-01-091-2/+3