aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1510 from gennadiycivil/masterGennadiy Civil2018-03-224-30/+38
|\
| * Merge branch 'master' into masterGennadiy Civil2018-03-221-1/+1
| |\ | |/ |/|
* | Update appveyor.ymlGennadiy Civil2018-03-221-1/+1
| * reverting gtest_list_tests_unittest.pyGennadiy Civil2018-03-221-2/+2
| * more mergesGennadiy Civil2018-03-221-2/+3
| * more mergesGennadiy Civil2018-03-224-5/+5
| * More mergesGennadiy Civil2018-03-213-28/+35
|/
* Merge pull request #1508 from gennadiycivil/masterGennadiy Civil2018-03-195-23/+130
|\
| * cl 189032107, againGennadiy Civil2018-03-162-5/+19
| * cl 189032107Gennadiy Civil2018-03-163-19/+9
| * merge, again, IsRecursiveContainerGennadiy Civil2018-03-156-20/+123
|/
* Merge pull request #1504 from gennadiycivil/masterGennadiy Civil2018-03-144-72/+24
|\
| * erging, contGennadiy Civil2018-03-141-15/+4
| * merging, mergingGennadiy Civil2018-03-132-39/+23
| * fixing, was removing too muchGennadiy Civil2018-03-131-0/+37
| * Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-03-134-8/+35
| |\ | |/ |/|
* | Merge pull request #1503 from sheepmaster/upstream_188748737Gennadiy Civil2018-03-124-8/+35
|\ \
| * \ Merge branch 'master' into upstream_188748737Bernhard Bauer2018-03-1264-620/+3159
| |\ \ | |/ / |/| |
* | | Merge pull request #1502 from gennadiycivil/masterGennadiy Civil2018-03-121-14/+22
|\ \ \
| | * | Allow macros inside of parametrized test names.Bernhard Bauer2018-03-124-8/+35
| | | * 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
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 01:13:36 +0000