Commits · 373481c5a9b9bf08c158703d6dc5ab58d4dee0cc · yangql / googletest

11 Apr, 2018 15 commits
- · 373481c5
  Gennadiy Civil authored Apr 11, 2018
```
...merging
```
  373481c5
- Merge branch 'master' of https://github.com/google/googletest · ef17a9f9
  Gennadiy Civil authored Apr 11, 2018
  
  ef17a9f9
- Merge pull request #1560 from gennadiycivil/master · 62736472
  Gennadiy Civil authored Apr 11, 2018
```
Upstream cl/192179348
```
  62736472
- merging · 8654c1ca
  Gennadiy Civil authored Apr 11, 2018
  
  8654c1ca
- Merge branch 'master' of https://github.com/google/googletest · af4cfd50
  Gennadiy Civil authored Apr 11, 2018
  
  af4cfd50
- · ab84d142
  Gennadiy Civil authored Apr 11, 2018
```
Upstream cl/192179348
```
  ab84d142
- Merge pull request #1559 from gennadiycivil/master · b4429c92
  Gennadiy Civil authored Apr 11, 2018
```
Upstream cl 191754725
```
  b4429c92
- Merge branch 'master' of https://github.com/google/googletest · 106e731e
  Gennadiy Civil authored Apr 11, 2018
  
  106e731e
- merging · c13ab600
  Gennadiy Civil authored Apr 11, 2018
  
  c13ab600
- Merge pull request #1558 from gennadiycivil/master · d5988e7d
  Gennadiy Civil authored Apr 11, 2018
```
RE-Doing the merge, this time with gcc on mac in the PR 
```
  d5988e7d
- ..and this should be it · 5cd213ea
  Gennadiy Civil authored Apr 11, 2018
  
  5cd213ea
- more · 6a7573a7
  Gennadiy Civil authored Apr 11, 2018
  
  6a7573a7
- · 039d9b54
  Gennadiy Civil authored Apr 11, 2018
```
pizza work, cont
```
  039d9b54
- · f15fd961
  Gennadiy Civil authored Apr 11, 2018
```
osx pizzas, cont
```
  f15fd961
- · b15be9a8
  Gennadiy Civil authored Apr 11, 2018
```
fixing osx pizza
```
  b15be9a8
10 Apr, 2018 8 commits
- merging · 6f9db261
  Gennadiy Civil authored Apr 10, 2018
  
  6f9db261
- · 9bc82ce7
  Gennadiy Civil authored Apr 10, 2018
```
merging
```
  9bc82ce7
- merging · 25d8176e
  Gennadiy Civil authored Apr 10, 2018
  
  25d8176e
- · 39c58da1
  Gennadiy Civil authored Apr 10, 2018
```
merge
```
  39c58da1
- · e1071eb9
  Gennadiy Civil authored Apr 10, 2018
```
RE-Doing the merge, this time with gcc on mac in the PR so I can catch errors before merging the PR
```
  e1071eb9
- Include gcc on mac into PR matrix · 8fbb4194
  Gennadiy Civil authored Apr 10, 2018
```
There was an error that slipped through and only showed up on PR merge (https://travis-ci.org/google/googletest/jobs/364304396/config ) , we dont want that again
```
  8fbb4194
- Merge pull request #1556 from google/revert-1551-master · a0726111
  Gennadiy Civil authored Apr 09, 2018
```
Revert "gmock actions 2"
```
  a0726111
- Revert "gmock actions 2" · ca54b673
  Gennadiy Civil authored Apr 09, 2018
  
  ca54b673
09 Apr, 2018 17 commits
- Merge pull request #1551 from gennadiycivil/master · 7f03f7ce
  Gennadiy Civil authored Apr 09, 2018
```
gmock actions 2
```
  7f03f7ce
- ... and this · 64d24b81
  Gennadiy Civil authored Apr 09, 2018
  
  64d24b81
- · c1d4c342
  Gennadiy Civil authored Apr 09, 2018
```
this should be it
```
  c1d4c342
- · f5871009
  Gennadiy Civil authored Apr 09, 2018
```
yet more
```
  f5871009
- · 05b5a538
  Gennadiy Civil authored Apr 09, 2018
```
formatting
```
  05b5a538
- · 2de24fbf
  Gennadiy Civil authored Apr 09, 2018
```
tuning
```
  2de24fbf
- · 055f3219
  Gennadiy Civil authored Apr 09, 2018
```
tuning
```
  055f3219
- · 57d6e824
  Gennadiy Civil authored Apr 09, 2018
```
more
```
  57d6e824
- · 44da2b9a
  Gennadiy Civil authored Apr 09, 2018
```
cont
```
  44da2b9a
- msvc · e93a0ece
  Gennadiy Civil authored Apr 09, 2018
  
  e93a0ece
- more msvc · c4684b49
  Gennadiy Civil authored Apr 09, 2018
  
  c4684b49
- msvc 14 · 431bfdca
  Gennadiy Civil authored Apr 09, 2018
  
  431bfdca
- · 8bc7c631
  Gennadiy Civil authored Apr 09, 2018
```
testing msvc again
```
  8bc7c631
- · c4e3d77d
  Gennadiy Civil authored Apr 09, 2018
```
More msvc 14 
```
  c4e3d77d
- · 6525044c
  Gennadiy Civil authored Apr 09, 2018
```
And also silence for MSVS14
```
  6525044c
- · 35a709a7
  Gennadiy Civil authored Apr 09, 2018
```
preproc syntax ( I can never remember it)
```
  35a709a7
- · 61e8a0b1
  Gennadiy Civil authored Apr 09, 2018
```
syntax
```
  61e8a0b1