aboutsummaryrefslogtreecommitdiffstats
path: root/googletest
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into fix_locale_winGennadiy Civil2018-04-041-1/+3
|\
| * Tweaking https://github.com/google/googletest/pull/1523 to exclude naclGennadiy Civil2018-04-041-1/+3
* | fix build break on locale windowsfo402252018-04-041-1/+1
|/
* Merge branch 'master' into int3Gennadiy Civil2018-04-031-1/+1
|\
| * Upstreaming, cl 191344765Gennadiy Civil2018-04-031-1/+1
* | Merge branch 'master' into int3Gennadiy Civil2018-04-031-19/+5
|\|
| * merging port, cont. 191443078Gennadiy Civil2018-04-031-3/+5
| * merging, cont - 2Gennadiy Civil2018-04-031-16/+0
* | Merge branch 'master' into int3Gennadiy Civil2018-04-031-10/+22
|\|
| * merging gtest-port.h , 191439094Gennadiy Civil2018-04-031-4/+7
| * merging, just comments formatGennadiy Civil2018-04-031-1/+3
| * testing, mergeGennadiy Civil2018-04-031-1/+1
| * Testing, gtest-port.h mergeGennadiy Civil2018-04-031-0/+3
| * merging gtest-port.h, again - 1Gennadiy Civil2018-04-021-5/+9
* | Merge branch 'master' into int3Roland Leißa2018-03-301-23/+46
|\|
| * Revert "merging gtest-port 1 of N"Gennadiy Civil2018-03-291-14/+9
| * Revert "merging gtest-port, 2"Gennadiy Civil2018-03-291-9/+37
* | Merge remote-tracking branch 'google/master' into int3Roland Leißa2018-03-291-37/+9
|\|
| * merging gtest-port, 2Gennadiy Civil2018-03-291-37/+9
* | typoRoland Leißa2018-03-291-1/+1
* | provide alternative for DebugBreak()Roland Leißa2018-03-281-0/+3
|/
* merging gtest-port 1 of NGennadiy Civil2018-03-271-9/+14
* merges 1Gennadiy Civil2018-03-261-3/+2
* merges, gtestGennadiy Civil2018-03-264-13/+19
* 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
* cl 189032107, againGennadiy Civil2018-03-162-5/+19
* cl 189032107Gennadiy Civil2018-03-161-17/+9
* merge, again, IsRecursiveContainerGennadiy Civil2018-03-154-20/+121
* 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 branch 'master' into upstream_188748737Bernhard Bauer2018-03-1237-362/+2432
| |\
| * | Allow macros inside of parametrized test names.Bernhard Bauer2018-03-124-8/+35
* | | More merges, removing old dead codeGennadiy Civil2018-03-132-65/+6
| |/ |/|
* | merges-port(1)Gennadiy Civil2018-03-121-14/+22
* | Merging, XML testsGennadiy Civil2018-03-074-26/+114
* | merges-8Gennadiy Civil2018-03-053-27/+47
* | merges-7Gennadiy Civil2018-03-051-25/+41
* | merges-6Gennadiy Civil2018-03-055-7/+4
* | merges-3Gennadiy Civil2018-03-051-1/+1
* | Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-03-051-2/+2
|\ \
| * | Use a full message in the JSON output for failuresPetr Hosek2018-03-011-2/+2
* | | Merges-1Gennadiy Civil2018-03-051-8/+12
|/ /
* | Merge branch 'master' into jsonGennadiy Civil2018-02-282-2/+4
|\ \
| * \ Merge branch 'master' into debug-postfixGennadiy Civil2018-02-282-3/+6
| |\ \
| * \ \ Merge branch 'master' into debug-postfixGennadiy Civil2018-02-273-2/+16
| |\ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 15:45:15 +0000