aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1552 from pwnall/mock-pumpGennadiy Civil2018-04-091-30/+60
|\ | | | | Sync gmock-generated-nice-strict.h.pump with gmock-generated-nice-strict.h
| * Sync gmock-generated-nice-strict.h.pump with gmock-generated-nice-strict.h.Victor Costan2018-04-061-30/+60
|/ | | | | | | | | | | | | | Commit fe402c27790ff1cc9a7e17c5d0aea4ebe7fd8a71 published the changes in internal CL 156157936, but missed the diff in gmock-generated-nice-strict.h.pump. This makes it difficult to reason about the change, because the .pump file is more concise than the generated file. This PR was tested by re-generating the .h file using the command below and checking the git diff. ./googletest/scripts/pump.py \ googlemock/include/gmock/gmock-generated-nice-strict.h.pump
* Merge pull request #1549 from gennadiycivil/masterGennadiy Civil2018-04-059-420/+573
|\ | | | | Merging gMock, 2
| * Merge branch 'master' of github.com:google/googletestGennadiy Civil2018-04-050-0/+0
| |\ | |/ |/|
* | Merge pull request #1547 from gennadiycivil/masterGennadiy Civil2018-04-052-37/+788
|\ \ | | | | | | Matchers testing
| | * Merging gMock, 2Gennadiy Civil2018-04-059-420/+573
| |/
| * formattingGennadiy Civil2018-04-051-2/+2
| |
| * And more MCVS warningsGennadiy Civil2018-04-051-5/+4
| |
| * fixing MCVS warnGennadiy Civil2018-04-051-0/+10
| |
| * Have to wait for this oneGennadiy Civil2018-04-051-2/+2
| |
| * Have to wait for this oneGennadiy Civil2018-04-051-1/+1
| |
| * Merging matchers testGennadiy Civil2018-04-051-0/+3
| |
| * Merge branch 'master' of github.com:google/googletestGennadiy Civil2018-04-051-1/+1
| |\ | |/ |/|
* | Merge pull request #1545 from gennadiycivil/masterGennadiy Civil2018-04-043-70/+487
|\ \ | | | | | | merging gmock matchers 1
| * \ Merge branch 'master' into masterGennadiy Civil2018-04-041-1/+1
| |\ \ | |/ / |/| |
* | | Merge pull request #1543 from fo40225/fix_locale_winGennadiy Civil2018-04-041-1/+1
|\ \ \ | | | | | | | | fix build break on locale windows
| * \ \ Merge branch 'master' into fix_locale_winGennadiy Civil2018-04-041-1/+3
| |\ \ \ | |/ / / |/| | |
| * | | fix build break on locale windowsfo402252018-04-041-1/+1
| | | |
| | | * Merging matchers testGennadiy Civil2018-04-051-40/+779
| | |/
| | * bad cut/pasteGennadiy Civil2018-04-041-1/+1
| | |
| | * More on MSVC warning C4503, decorated name length exceededGennadiy Civil2018-04-041-2/+6
| | |
| | * More on MSVC warning C4503, decorated name length exceededGennadiy Civil2018-04-041-1/+1
| | |
| | * Address MSVC warning C4503, decorated name length exceeded, name was truncatedGennadiy Civil2018-04-041-0/+2
| | |
| | * Fixing build break on MSVCGennadiy Civil2018-04-041-1/+1
| | |
| | * Merge branch 'master' of github.com:google/googletestGennadiy Civil2018-04-040-0/+0
| | |\ | |_|/ |/| |
* | | Merge pull request #1542 from gennadiycivil/masterGennadiy Civil2018-04-041-1/+3
|\ \ \ | |/ / |/| | Tweaking #1523 to exclude nacl, cl 191591810
| | * merging gmock matchers 1Gennadiy Civil2018-04-043-72/+483
| |/
| * Tweaking https://github.com/google/googletest/pull/1523 to exclude naclGennadiy Civil2018-04-041-1/+3
|/
* Merge pull request #1523 from leissa/int3Gennadiy Civil2018-04-041-0/+3
|\ | | | | provide alternative for DebugBreak()
| * Merge branch 'master' into int3Gennadiy Civil2018-04-031-1/+1
| |\ | |/ |/|
* | Merge pull request #1541 from gennadiycivil/masterGennadiy Civil2018-04-031-1/+1
|\ \ | | | | | | Upstream, 191344765
| * \ Merge branch 'master' of github.com:google/googletestGennadiy Civil2018-04-030-0/+0
| |\ \ | |/ / |/| |
| * | Upstreaming, cl 191344765Gennadiy Civil2018-04-031-1/+1
| | |
| | * Merge branch 'master' into int3Gennadiy Civil2018-04-031-19/+5
| | |\ | |_|/ |/| |
* | | Merge pull request #1539 from gennadiycivil/masterGennadiy Civil2018-04-031-19/+5
|\| | | | | | | | merging port, continue
| * | merging port, cont. 191443078Gennadiy Civil2018-04-031-3/+5
| | |
| * | Merge branch 'master' of github.com:google/googletestGennadiy Civil2018-04-030-0/+0
| |\ \ | |/ / |/| |
| * | merging, cont - 2Gennadiy Civil2018-04-031-16/+0
| | |
| | * Merge branch 'master' into int3Gennadiy Civil2018-04-031-10/+22
| | |\ | |_|/ |/| |
* | | Merge pull request #1538 from gennadiycivil/masterGennadiy Civil2018-04-031-4/+7
|\| | | | | | | | merging , cont
| * | 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
|\ \ \ | | | | | | | | gtest-port.h merge
| | * | 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
|\ \ \ | | | | | | | | merging gtest-port.h, again - 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-302-25/+46
| |\ | |/ |/|
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-26 03:09:35 +0000