Commits · fe402c27790ff1cc9a7e17c5d0aea4ebe7fd8a71 · Chen Yisong / googletest

05 Apr, 2018 9 commits
- Merging gMock, 2 · fe402c27
  Gennadiy Civil authored Apr 05, 2018
  
  fe402c27
- formatting · 7e5f90d3
  Gennadiy Civil authored Apr 05, 2018
  
  7e5f90d3
- And more MCVS warnings · 92863613
  Gennadiy Civil authored Apr 05, 2018
  
  92863613
- fixing MCVS warn · e0f4cf05
  Gennadiy Civil authored Apr 05, 2018
  
  e0f4cf05
- Have to wait for this one · 7045138a
  Gennadiy Civil authored Apr 05, 2018
  
  7045138a
- Have to wait for this one · 66eaf9f0
  Gennadiy Civil authored Apr 05, 2018
  
  66eaf9f0
- Merging matchers test · af93d59e
  Gennadiy Civil authored Apr 05, 2018
  
  af93d59e
- Merge branch 'master' of github.com:google/googletest · 47d15bce
  Gennadiy Civil authored Apr 05, 2018
  
  47d15bce
- Merging matchers test · 0cd6a4f5
  Gennadiy Civil authored Apr 05, 2018
  
  0cd6a4f5
04 Apr, 2018 15 commits
- Merge pull request #1545 from gennadiycivil/master · 2cf2a1f8
  Gennadiy Civil authored Apr 04, 2018
```
 merging gmock matchers 1
```
  2cf2a1f8
- Merge branch 'master' into master · f7098a2a
  Gennadiy Civil authored Apr 04, 2018
  
  f7098a2a
- bad cut/paste · d81b6a0c
  Gennadiy Civil authored Apr 04, 2018
  
  d81b6a0c
- More on MSVC warning C4503, decorated name length exceeded · a608d4a3
  Gennadiy Civil authored Apr 04, 2018
  
  a608d4a3
- More on MSVC warning C4503, decorated name length exceeded · 6f4e9394
  Gennadiy Civil authored Apr 04, 2018
  
  6f4e9394
- Address MSVC warning C4503, decorated name length exceeded, name was truncated · 5b3d2772
  Gennadiy Civil authored Apr 04, 2018
  
  5b3d2772
- Fixing build break on MSVC · aa14cc42
  Gennadiy Civil authored Apr 04, 2018
  
  aa14cc42
- Merge pull request #1543 from fo40225/fix_locale_win · 891e436c
  Gennadiy Civil authored Apr 04, 2018
```
fix build break on locale windows
```
  891e436c
- Merge branch 'master' of github.com:google/googletest · 0f790fa5
  Gennadiy Civil authored Apr 04, 2018
  
  0f790fa5
- merging gmock matchers 1 · e55089ec
  Gennadiy Civil authored Apr 04, 2018
  
  e55089ec
- Merge branch 'master' into fix_locale_win · fbe3c945
  Gennadiy Civil authored Apr 04, 2018
  
  fbe3c945
- Merge pull request #1542 from gennadiycivil/master · 43776990
  Gennadiy Civil authored Apr 04, 2018
```
Tweaking #1523 to exclude nacl, cl 191591810
```
  43776990
- fix build break on locale windows · a0c27bd8
  fo40225 authored Apr 04, 2018
  
  a0c27bd8
- Tweaking https://github.com/google/googletest/pull/1523 to exclude nacl · 1776ed8c
  Gennadiy Civil authored Apr 04, 2018
  
  1776ed8c
- Merge pull request #1523 from leissa/int3 · 07af8af3
  Gennadiy Civil authored Apr 04, 2018
```
provide alternative for DebugBreak()
```
  07af8af3
03 Apr, 2018 16 commits
- Merge branch 'master' into int3 · 98687b78
  Gennadiy Civil authored Apr 03, 2018
  
  98687b78
- Merge pull request #1541 from gennadiycivil/master · 7d955430
  Gennadiy Civil authored Apr 03, 2018
```
Upstream, 191344765
```
  7d955430
- Merge branch 'master' into int3 · 18be0124
  Gennadiy Civil authored Apr 03, 2018
  
  18be0124
- Merge branch 'master' of github.com:google/googletest · 75ea13de
  Gennadiy Civil authored Apr 03, 2018
  
  75ea13de
- Upstreaming, cl 191344765 · d52aaee8
  Gennadiy Civil authored Apr 03, 2018
  
  d52aaee8
- Merge pull request #1539 from gennadiycivil/master · ac783bd7
  Gennadiy Civil authored Apr 03, 2018
```
merging port, continue
```
  ac783bd7
- Merge branch 'master' into int3 · 27507429
  Gennadiy Civil authored Apr 03, 2018
  
  27507429
- merging port, cont. 191443078 · a2dd1365
  Gennadiy Civil authored Apr 03, 2018
  
  a2dd1365
- Merge branch 'master' of github.com:google/googletest · 1065591b
  Gennadiy Civil authored Apr 03, 2018
  
  1065591b
- merging, cont - 2 · aa349acb
  Gennadiy Civil authored Apr 03, 2018
  
  aa349acb
- Merge pull request #1538 from gennadiycivil/master · 6c9d07f1
  Gennadiy Civil authored Apr 03, 2018
```
merging , cont
```
  6c9d07f1
- Merge branch 'master' of github.com:google/googletest · 6abaa246
  Gennadiy Civil authored Apr 03, 2018
  
  6abaa246
- merging gtest-port.h , 191439094 · 2cedd5b9
  Gennadiy Civil authored Apr 03, 2018
  
  2cedd5b9
- Merge pull request #1537 from gennadiycivil/master · 653a435f
  Gennadiy Civil authored Apr 03, 2018
```
gtest-port.h merge
```
  653a435f
- merging, just comments format · 04d1e56b
  Gennadiy Civil authored Apr 03, 2018
  
  04d1e56b
- testing, merge · 5beb452b
  Gennadiy Civil authored Apr 03, 2018
  
  5beb452b