aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* More merges, removing old dead codeGennadiy Civil2018-03-134-72/+14
* merges-port(1)Gennadiy Civil2018-03-121-14/+22
* Merge pull request #1497 from gennadiycivil/masterGennadiy Civil2018-03-074-26/+114
|\
| * Merging, XML testsGennadiy Civil2018-03-074-26/+114
|/
* Merge pull request #1493 from gennadiycivil/masterGennadiy Civil2018-03-053-27/+47
|\
| * merges-8Gennadiy Civil2018-03-053-27/+47
|/
* Merge pull request #1492 from gennadiycivil/masterGennadiy Civil2018-03-051-25/+41
|\
| * merges-7Gennadiy Civil2018-03-051-25/+41
|/
* Merge pull request #1491 from gennadiycivil/masterGennadiy Civil2018-03-055-7/+4
|\
| * merges-6Gennadiy Civil2018-03-055-7/+4
|/
* Merge pull request #1490 from gennadiycivil/masterGennadiy Civil2018-03-051-1/+1
|\
| * Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-03-050-0/+0
| |\ | |/ |/|
* | Merge pull request #1489 from gennadiycivil/masterGennadiy Civil2018-03-052-4/+14
|\ \
| | * merges-3Gennadiy Civil2018-03-051-1/+1
| |/
| * Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-03-050-0/+0
| |\ | |/ |/|
* | Merge pull request #1488 from gennadiycivil/masterGennadiy Civil2018-03-053-12/+17
|\ \
| | * merges-2Gennadiy Civil2018-03-052-4/+14
| |/
| * Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-03-053-2/+8
| |\ | |/ |/|
* | Merge pull request #1477 from sgraham/unsigned-wcharGennadiy Civil2018-03-052-0/+6
|\ \
| * \ Merge branch 'master' into unsigned-wcharGennadiy Civil2018-03-051-2/+2
| |\ \ | |/ / |/| |
* | | Merge pull request #1486 from petrhosek/json-stacktraceGennadiy Civil2018-03-021-2/+2
|\ \ \
| * | | Use a full message in the JSON output for failuresPetr Hosek2018-03-011-2/+2
|/ / /
| * | Merge branch 'master' into unsigned-wcharGennadiy Civil2018-03-0114-139/+1880
| |\ \ | |/ / |/| |
| * | Merge branch 'master' into unsigned-wcharGennadiy Civil2018-02-273-2/+16
| |\ \
| * \ \ Merge branch 'master' into unsigned-wcharGennadiy Civil2018-02-262-22/+20
| |\ \ \
| * | | | Try to handle unsigned wchar_t (arm) a bit betterScott Graham2018-02-232-0/+6
| | | | * Merges-1Gennadiy Civil2018-03-053-12/+17
| |_|_|/ |/| | |
* | | | Merge pull request #1485 from coryan/parallelize-appveyorGennadiy Civil2018-02-281-1/+2
|\ \ \ \
| * | | | Add options to parallelize builds.Carlos O'Ryan2018-02-281-1/+2
* | | | | Merge pull request #1479 from petrhosek/jsonGennadiy Civil2018-02-286-10/+1403
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch 'master' into jsonGennadiy Civil2018-02-282-2/+4
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #1481 from dneto0/debug-postfixGennadiy Civil2018-02-282-2/+4
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into debug-postfixGennadiy Civil2018-02-287-126/+471
| |\ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch 'master' into debug-postfixGennadiy Civil2018-02-273-2/+16
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Use DEBUG_POSTFIX instead of CMAKE_DEBUG_POSTFIXDavid Neto2018-02-262-2/+4
| | |_|_|/ | |/| | |
| | | * | Support JSON output format in addition to XMLPetr Hosek2018-02-286-10/+1403
| |_|/ / |/| | |
* | | | Merge pull request #1482 from zhangxy988/variant_matcherGennadiy Civil2018-02-273-0/+137
|\ \ \ \
| * \ \ \ Merge branch 'variant_matcher' of https://github.com/zhangxy988/googletest in...Xiaoyi Zhang2018-02-275-126/+334
| |\ \ \ \
| | * \ \ \ Merge branch 'master' into variant_matcherXiaoyi Zhang2018-02-275-126/+334
| | |\ \ \ \ | |_|/ / / / |/| | | | |
* | | | | | Merge pull request #1483 from gennadiycivil/masterGennadiy Civil2018-02-273-123/+328
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into masterGennadiy Civil2018-02-272-3/+6
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #1423 from pcc/win-libcxx2Gennadiy Civil2018-02-272-3/+6
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Merge branch 'master' into win-libcxx2Gennadiy Civil2018-02-2752-354/+826
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | Use _CPPUNWIND instead of _HAS_EXCEPTIONS with MSVC.Peter Collingbourne2018-01-251-2/+5
| * | | | | | Pass -EHs-c- to disable exceptions with MSVC.Peter Collingbourne2018-01-251-1/+1
| | | * | | | gmock merging -2Gennadiy Civil2018-02-273-123/+328
| |_|/ / / / |/| | | | |
| | | * | | Merge branch 'variant_matcher' of https://github.com/zhangxy988/googletest in...Xiaoyi Zhang2018-02-273-2/+16
| | | |\| |
| | | | * | Merge branch 'master' into variant_matcherGennadiy Civil2018-02-273-2/+16
| | | | |\ \ | |_|_|_|/ / |/| | | | |
* | | | | | Merge pull request #1464 from pwnall/death-styleGennadiy Civil2018-02-273-2/+16
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Switch default death test style back to "fast".Victor Costan2018-02-273-2/+16
|/ / / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 04:21:58 +0000