Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | Fix double free when building Gtest/GMock in shared libraries and linking a ↵ | Romain Geissler | 2017-12-02 | 1 | -23/+40 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | test executable with both. | |||||
| | | | | * | | 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 | |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Trying to fix travis | Gennadiy Civil | 2018-01-11 | 1 | -4/+0 | |
| | | | | | | ||||||
| | | | | * | Merge branch 'support_xboxone' of ↵ | Gaspard Petit | 2018-01-12 | 0 | -0/+0 | |
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | https://github.com/eidosmontreal/googletest into support_xboxone | |||||
| | | | | | * | Merge branch 'support_xboxone' of ↵ | Gaspard Petit | 2018-01-12 | 0 | -0/+0 | |
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/eidosmontreal/googletest into support_xboxone | |||||
| | | | | | | * | Merge branch 'master' into support_xboxone | Gaspard Petit | 2018-01-09 | 93 | -986/+1211 | |
| | | | | | | |\ | ||||||
| | | | | | | * \ | Merge branch 'master' into support_xboxone | Gennadiy Civil | 2017-09-06 | 39 | -104/+498 | |
| | | | | | | |\ \ | ||||||
| | | | | | | * \ \ | Merge branch 'master' into support_xboxone | Gennadiy Civil | 2017-08-24 | 42 | -1261/+2028 | |
| | | | | | | |\ \ \ | ||||||
| | | | | | | * \ \ \ | Merge branch 'master' into support_xboxone | Gennadiy Civil | 2017-08-17 | 1 | -2/+1 | |
| | | | | | | |\ \ \ \ | ||||||
| | | | | | | * \ \ \ \ | Merge branch 'master' into support_xboxone | Gennadiy Civil | 2017-08-16 | 11 | -6/+233 | |
| | | | | | | |\ \ \ \ \ | ||||||
| | | | | | | * \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into support_xboxone | gpetit | 2017-08-14 | 111 | -27398/+1254 | |
| | | | | | | |\ \ \ \ \ \ | ||||||
| | | | | | | * | | | | | | | Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOne | gpetit | 2017-08-14 | 2 | -1/+4 | |
| | | | | | | | | | | | | | | ||||||
| | | | | | * | | | | | | | | Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOne | gpetit | 2018-01-12 | 2 | -1/+4 | |
| |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | ||||||
| | | | | * | | | | | | | | Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOne | gpetit | 2018-01-12 | 2 | -1/+4 | |
| |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Update .travis.yml | Gennadiy Civil | 2018-01-11 | 1 | -2/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trying to get around mongoDB expired keys, etc | |||||
* | | | | | | | | | | | | 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 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merging, Upstream cl 103120214 | |||||
| * | | | | | | | | | | | 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 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | more cleanup | |||||
| | * | | | | | | | | | | | 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 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Code Merge, upsteam of accumulated changes, cleanup | |||||
| | * | | | | | | | | | | | 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 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | small cleanup/,merge | |||||
* \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #1395 from gennadiycivil/master | Gennadiy Civil | 2018-01-10 | 4 | -17/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | code merge, cleanups | |||||
| | | * | | | | | | | | | | | 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 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | wip, cleanups/merge | |||||
| | * | | | | | | | | | | 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 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | wip, cleanups/merge | Gennadiy Civil | 2018-01-09 | 3 | -5/+3 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #1393 from gennadiycivil/master | Gennadiy Civil | 2018-01-09 | 3 | -2/+4 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | cleanup, merge | |||||
| * | | | | | | | | | Merge branch 'master' into master | Gennadiy Civil | 2018-01-09 | 3 | -7/+18 | |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #1388 from rongjiecomputer/bazel | Gennadiy Civil | 2018-01-08 | 3 | -7/+18 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | [Bazel] Detect Windows with cpu value x64_windows and x64_windows_msvc | |||||
| * | | | | | | | | | | [Bazel] Detect Windows with cpu value x64_windows and x64_windows_msvc | Loo Rong Jie | 2018-01-09 | 3 | -7/+18 | |
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and x64_windows_msvc | |||||
* | | | | | | | | | | Merge pull request #1390 from gennadiycivil/master | Gennadiy Civil | 2018-01-08 | 2 | -2/+5 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Small cleanups, merge |