aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * Merge branch 'master' into int3Gennadiy Civil2018-04-031-10/+22
| | |\ | |_|/ |/| |
* | | Merge pull request #1538 from gennadiycivil/masterGennadiy Civil2018-04-031-4/+7
|\| |
| * | Merge branch 'master' of github.com:google/googletestGennadiy Civil2018-04-030-0/+0
| |\ \ | |/ / |/| |
* | | Merge pull request #1537 from gennadiycivil/masterGennadiy Civil2018-04-031-1/+6
|\ \ \
| | * | 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
| * | Merge branch 'master' of github.com:google/googletestGennadiy Civil2018-04-030-0/+0
| |\ \ | |/ / |/| |
* | | Merge pull request #1534 from gennadiycivil/masterGennadiy Civil2018-04-021-5/+9
|\ \ \
| | * | 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-302-25/+46
| |\ | |/ |/|
* | Include OSX builds back into PR buildsGennadiy Civil2018-03-291-2/+0
* | Merge pull request #1527 from google/revert-1518-masterGennadiy Civil2018-03-291-14/+9
|\ \
| * | Revert "merging gtest-port 1 of N"Gennadiy Civil2018-03-291-14/+9
|/ /
* | Merge pull request #1526 from google/revert-1525-masterGennadiy Civil2018-03-291-9/+37
|\ \
| * | 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
| |\ | |/ |/|
* | Merge pull request #1525 from gennadiycivil/masterGennadiy Civil2018-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
|/
* Merge pull request #1518 from gennadiycivil/masterGennadiy Civil2018-03-271-9/+14
|\
| * merging gtest-port 1 of NGennadiy Civil2018-03-271-9/+14
|/
* Merge pull request #1515 from gennadiycivil/masterGennadiy Civil2018-03-264-12/+17
|\
| * merges 1Gennadiy Civil2018-03-261-3/+2
| * Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-03-260-0/+0
| |\ | |/ |/|
* | Merge pull request #1512 from gennadiycivil/masterGennadiy Civil2018-03-264-119/+662
|\ \
| | * merges, gtestGennadiy Civil2018-03-264-13/+19
| |/
| * merging gmock-matchers.h 3Gennadiy Civil2018-03-261-13/+36
| * merging gmock-matchers.h 2Gennadiy Civil2018-03-261-7/+44
| * Upstreaming FloatingEq2Matcher,Gennadiy Civil2018-03-261-9/+13
| * Merging gmock-matchers.h -2 Gennadiy Civil2018-03-231-29/+208
| * gmock-matchers merging -2 Gennadiy Civil2018-03-231-10/+250
| * Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-03-221-1/+1
| |\ | |/ |/|
* | 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
| | * merging, gmock -1Gennadiy Civil2018-03-224-60/+120
| |/
| * 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-10 00:22:00 +0000