Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | more MSVC warnings | Gennadiy Civil | 2018-04-06 | 1 | -0/+11 | |
| | | ||||||
| * | warnings | Gennadiy Civil | 2018-04-06 | 1 | -1/+2 | |
| | | ||||||
| * | cont - 2 | Gennadiy Civil | 2018-04-06 | 1 | -1/+1 | |
| | | ||||||
| * | cont | Gennadiy Civil | 2018-04-06 | 1 | -1/+1 | |
| | | ||||||
| * | more warnings | Gennadiy Civil | 2018-04-06 | 1 | -1/+1 | |
| | | ||||||
| * | deal with MSVC warn, cont 1 | Gennadiy Civil | 2018-04-06 | 1 | -2/+1 | |
| | | ||||||
| * | Cont. deal with MCVS warnings | Gennadiy Civil | 2018-04-06 | 2 | -2/+16 | |
| | | ||||||
| * | Deal with MCVS warnings | Gennadiy Civil | 2018-04-06 | 1 | -0/+6 | |
| | | ||||||
| * | Merge branch 'master' of github.com:google/googletest | Gennadiy Civil | 2018-04-06 | 0 | -0/+0 | |
| |\ | |/ |/| | ||||||
* | | Merge pull request #1549 from gennadiycivil/master | Gennadiy Civil | 2018-04-05 | 9 | -420/+573 | |
|\ \ | | | | | | | Merging gMock, 2 | |||||
| | * | merging gmock-actions 2 | Gennadiy Civil | 2018-04-06 | 2 | -18/+216 | |
| |/ | ||||||
| * | Merge branch 'master' of github.com:google/googletest | Gennadiy Civil | 2018-04-05 | 0 | -0/+0 | |
| |\ | |/ |/| | ||||||
* | | Merge pull request #1547 from gennadiycivil/master | Gennadiy Civil | 2018-04-05 | 2 | -37/+788 | |
|\ \ | | | | | | | Matchers testing | |||||
| | * | Merging gMock, 2 | Gennadiy Civil | 2018-04-05 | 9 | -420/+573 | |
| |/ | ||||||
| * | formatting | Gennadiy Civil | 2018-04-05 | 1 | -2/+2 | |
| | | ||||||
| * | And more MCVS warnings | Gennadiy Civil | 2018-04-05 | 1 | -5/+4 | |
| | | ||||||
| * | fixing MCVS warn | Gennadiy Civil | 2018-04-05 | 1 | -0/+10 | |
| | | ||||||
| * | Have to wait for this one | Gennadiy Civil | 2018-04-05 | 1 | -2/+2 | |
| | | ||||||
| * | Have to wait for this one | Gennadiy Civil | 2018-04-05 | 1 | -1/+1 | |
| | | ||||||
| * | Merging matchers test | Gennadiy Civil | 2018-04-05 | 1 | -0/+3 | |
| | | ||||||
| * | Merge branch 'master' of github.com:google/googletest | Gennadiy Civil | 2018-04-05 | 1 | -1/+1 | |
| |\ | |/ |/| | ||||||
* | | Merge pull request #1545 from gennadiycivil/master | Gennadiy Civil | 2018-04-04 | 3 | -70/+487 | |
|\ \ | | | | | | | merging gmock matchers 1 | |||||
| * \ | Merge branch 'master' into master | Gennadiy Civil | 2018-04-04 | 1 | -1/+1 | |
| |\ \ | |/ / |/| | | ||||||
* | | | Merge pull request #1543 from fo40225/fix_locale_win | Gennadiy Civil | 2018-04-04 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | fix build break on locale windows | |||||
| * \ \ | Merge branch 'master' into fix_locale_win | Gennadiy Civil | 2018-04-04 | 1 | -1/+3 | |
| |\ \ \ | |/ / / |/| | | | ||||||
| * | | | fix build break on locale windows | fo40225 | 2018-04-04 | 1 | -1/+1 | |
| | | | | ||||||
| | | * | Merging matchers test | Gennadiy Civil | 2018-04-05 | 1 | -40/+779 | |
| | |/ | ||||||
| | * | bad cut/paste | Gennadiy Civil | 2018-04-04 | 1 | -1/+1 | |
| | | | ||||||
| | * | More on MSVC warning C4503, decorated name length exceeded | Gennadiy Civil | 2018-04-04 | 1 | -2/+6 | |
| | | | ||||||
| | * | More on MSVC warning C4503, decorated name length exceeded | Gennadiy Civil | 2018-04-04 | 1 | -1/+1 | |
| | | | ||||||
| | * | Address MSVC warning C4503, decorated name length exceeded, name was truncated | Gennadiy Civil | 2018-04-04 | 1 | -0/+2 | |
| | | | ||||||
| | * | Fixing build break on MSVC | Gennadiy Civil | 2018-04-04 | 1 | -1/+1 | |
| | | | ||||||
| | * | Merge branch 'master' of github.com:google/googletest | Gennadiy Civil | 2018-04-04 | 0 | -0/+0 | |
| | |\ | |_|/ |/| | | ||||||
* | | | Merge pull request #1542 from gennadiycivil/master | Gennadiy Civil | 2018-04-04 | 1 | -1/+3 | |
|\ \ \ | |/ / |/| | | Tweaking #1523 to exclude nacl, cl 191591810 | |||||
| | * | merging gmock matchers 1 | Gennadiy Civil | 2018-04-04 | 3 | -72/+483 | |
| |/ | ||||||
| * | Tweaking https://github.com/google/googletest/pull/1523 to exclude nacl | Gennadiy Civil | 2018-04-04 | 1 | -1/+3 | |
|/ | ||||||
* | Merge pull request #1523 from leissa/int3 | Gennadiy Civil | 2018-04-04 | 1 | -0/+3 | |
|\ | | | | | provide alternative for DebugBreak() | |||||
| * | Merge branch 'master' into int3 | Gennadiy Civil | 2018-04-03 | 1 | -1/+1 | |
| |\ | |/ |/| | ||||||
* | | Merge pull request #1541 from gennadiycivil/master | Gennadiy Civil | 2018-04-03 | 1 | -1/+1 | |
|\ \ | | | | | | | Upstream, 191344765 | |||||
| * \ | Merge branch 'master' of github.com:google/googletest | Gennadiy Civil | 2018-04-03 | 0 | -0/+0 | |
| |\ \ | |/ / |/| | | ||||||
| * | | Upstreaming, cl 191344765 | Gennadiy Civil | 2018-04-03 | 1 | -1/+1 | |
| | | | ||||||
| | * | Merge branch 'master' into int3 | Gennadiy Civil | 2018-04-03 | 1 | -19/+5 | |
| | |\ | |_|/ |/| | | ||||||
* | | | Merge pull request #1539 from gennadiycivil/master | Gennadiy Civil | 2018-04-03 | 1 | -19/+5 | |
|\| | | | | | | | | merging port, continue | |||||
| * | | merging port, cont. 191443078 | Gennadiy Civil | 2018-04-03 | 1 | -3/+5 | |
| | | | ||||||
| * | | Merge branch 'master' of github.com:google/googletest | Gennadiy Civil | 2018-04-03 | 0 | -0/+0 | |
| |\ \ | |/ / |/| | | ||||||
| * | | merging, cont - 2 | Gennadiy Civil | 2018-04-03 | 1 | -16/+0 | |
| | | | ||||||
| | * | Merge branch 'master' into int3 | Gennadiy Civil | 2018-04-03 | 1 | -10/+22 | |
| | |\ | |_|/ |/| | | ||||||
* | | | Merge pull request #1538 from gennadiycivil/master | Gennadiy Civil | 2018-04-03 | 1 | -4/+7 | |
|\| | | | | | | | | merging , cont | |||||
| * | | Merge branch 'master' of github.com:google/googletest | Gennadiy Civil | 2018-04-03 | 0 | -0/+0 | |
| |\ \ | |/ / |/| | | ||||||
* | | | Merge pull request #1537 from gennadiycivil/master | Gennadiy Civil | 2018-04-03 | 1 | -1/+6 | |
|\ \ \ | | | | | | | | | gtest-port.h merge |