summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fixing MSVCGennadiy Civil2018-04-062-1/+3
* more warningsGennadiy Civil2018-04-061-0/+12
* more warningsGennadiy Civil2018-04-061-0/+1
* more MSVC warningsGennadiy Civil2018-04-061-0/+11
* warningsGennadiy Civil2018-04-061-1/+2
* cont - 2Gennadiy Civil2018-04-061-1/+1
* contGennadiy Civil2018-04-061-1/+1
* more warningsGennadiy Civil2018-04-061-1/+1
* deal with MSVC warn, cont 1Gennadiy Civil2018-04-061-2/+1
* Cont. deal with MCVS warningsGennadiy Civil2018-04-062-2/+16
* Deal with MCVS warningsGennadiy Civil2018-04-061-0/+6
* Merge branch 'master' of github.com:google/googletestGennadiy Civil2018-04-060-0/+0
|\
| * Merge pull request #1549 from gennadiycivil/masterGennadiy Civil2018-04-059-420/+573
| |\
* | | merging gmock-actions 2Gennadiy Civil2018-04-062-18/+216
| |/ |/|
* | Merge branch 'master' of github.com:google/googletestrefs/pull/1549/headGennadiy Civil2018-04-050-0/+0
|\ \ | |/
| * Merge pull request #1547 from gennadiycivil/masterGennadiy Civil2018-04-052-37/+788
| |\
* | | Merging gMock, 2Gennadiy Civil2018-04-059-420/+573
| |/ |/|
* | formattingrefs/pull/1547/headGennadiy 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
| |\
| | * Merge branch 'master' into masterrefs/pull/1545/headGennadiy Civil2018-04-041-1/+1
| | |\ | | |/ | |/|
| * | Merge pull request #1543 from fo40225/fix_locale_winGennadiy Civil2018-04-041-1/+1
| |\ \
| | * \ Merge branch 'master' into fix_locale_winrefs/pull/1543/headGennadiy 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
| |\ \ | | |/ | |/|
* | | merging gmock matchers 1Gennadiy Civil2018-04-043-72/+483
| |/ |/|
* | Tweaking https://github.com/google/googletest/pull/1523 to exclude naclrefs/pull/1542/headGennadiy Civil2018-04-041-1/+3
|/
* Merge pull request #1523 from leissa/int3Gennadiy Civil2018-04-041-0/+3
|\
| * Merge branch 'master' into int3refs/pull/1523/headGennadiy Civil2018-04-031-1/+1
| |\ | |/ |/|
* | Merge pull request #1541 from gennadiycivil/masterGennadiy Civil2018-04-031-1/+1
|\ \
| * \ Merge branch 'master' of github.com:google/googletestrefs/pull/1541/headGennadiy 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, cont. 191443078refs/pull/1539/headGennadiy 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
| | |\ | |_|/ |/| |