aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | Fix double free when building Gtest/GMock in shared libraries and linking a ↵Romain Geissler2017-12-021-23/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | test executable with both.
| | | | | * | 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
| |\ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Trying to fix travisGennadiy Civil2018-01-111-4/+0
| | | | | |
| | | | | * Merge branch 'support_xboxone' of ↵Gaspard Petit2018-01-120-0/+0
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | https://github.com/eidosmontreal/googletest into support_xboxone
| | | | | | * Merge branch 'support_xboxone' of ↵Gaspard Petit2018-01-120-0/+0
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/eidosmontreal/googletest into support_xboxone
| | | | | | | * Merge branch 'master' into support_xboxoneGaspard Petit2018-01-0993-986/+1211
| | | | | | | |\
| | | | | | | * \ Merge branch 'master' into support_xboxoneGennadiy Civil2017-09-0639-104/+498
| | | | | | | |\ \
| | | | | | | * \ \ Merge branch 'master' into support_xboxoneGennadiy Civil2017-08-2442-1261/+2028
| | | | | | | |\ \ \
| | | | | | | * \ \ \ Merge branch 'master' into support_xboxoneGennadiy Civil2017-08-171-2/+1
| | | | | | | |\ \ \ \
| | | | | | | * \ \ \ \ Merge branch 'master' into support_xboxoneGennadiy Civil2017-08-1611-6/+233
| | | | | | | |\ \ \ \ \
| | | | | | | * \ \ \ \ \ Merge remote-tracking branch 'origin/master' into support_xboxonegpetit2017-08-14111-27398/+1254
| | | | | | | |\ \ \ \ \ \
| | | | | | | * | | | | | | Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOnegpetit2017-08-142-1/+4
| | | | | | | | | | | | | |
| | | | | | * | | | | | | | Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOnegpetit2018-01-122-1/+4
| |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | |
| | | | | * | | | | | | | Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOnegpetit2018-01-122-1/+4
| |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Update .travis.ymlGennadiy Civil2018-01-111-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trying to get around mongoDB expired keys, etc
* | | | | | | | | | | | 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
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merging, Upstream cl 103120214
| * | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | more cleanup
| | * | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Code Merge, upsteam of accumulated changes, cleanup
| | * | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | small cleanup/,merge
* \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #1395 from gennadiycivil/masterGennadiy Civil2018-01-104-17/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | code merge, cleanups
| | | * | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | wip, cleanups/merge
| | * | | | | | | | | | 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
| | | | | | | | | | |
| * | | | | | | | | | wip, cleanups/mergeGennadiy Civil2018-01-093-5/+3
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #1393 from gennadiycivil/masterGennadiy Civil2018-01-093-2/+4
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | cleanup, merge
| * | | | | | | | | Merge branch 'master' into masterGennadiy Civil2018-01-093-7/+18
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #1388 from rongjiecomputer/bazelGennadiy Civil2018-01-083-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_msvcLoo Rong Jie2018-01-093-7/+18
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and x64_windows_msvc
* | | | | | | | | | Merge pull request #1390 from gennadiycivil/masterGennadiy Civil2018-01-082-2/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Small cleanups, merge