Commits · 64d23926f9e492b59ffac8198604ca9c3768b845 · yangql / googletest

27 Aug, 2015 2 commits
- Merge pull request #568 from lacombar/googlemock-build-dir · 64d23926
  Billy Donahue authored Aug 27, 2015
```
googlemock: change guess of googletest's relative location from ../gtest to ../googletest
```
  64d23926
- googlemock: fix unified build · eff38a7a
  Arnaud Lacombe authored Aug 26, 2015
  
  eff38a7a
26 Aug, 2015 1 commit
- Update README.md · fba82582
  Billy Donahue authored Aug 26, 2015
  
  fba82582
25 Aug, 2015 21 commits
- Update README.md · bf5753ac
  Billy Donahue authored Aug 25, 2015
  
  bf5753ac
- Update README.md · 09fd2462
  Billy Donahue authored Aug 25, 2015
  
  09fd2462
- Merge pull request #512 from google/unification · 0b6d3b19
  Billy Donahue authored Aug 25, 2015
```
Unify googlemock into googletest
```
  0b6d3b19
- Merge pull request #511 from BillyDonahue/unification · 661699bf
  Billy Donahue authored Aug 25, 2015
```
Bring GoogleMock into the GoogleTest repository
```
  661699bf
- tiny fix · 8a3c8c93
  Billy Donahue authored Aug 25, 2015
  
  8a3c8c93
- unified project home · 5b3ef3bd
  Billy Donahue authored Aug 25, 2015
  
  5b3ef3bd
- cat _home.md files into README.md · 7563fe55
  Billy Donahue authored Aug 25, 2015
  
  7563fe55
- move ProjectHome files into root · 67f6188c
  Billy Donahue authored Aug 25, 2015
  
  67f6188c
- Merge branch 'unification' of github.com:BillyDonahue/googlemock into unification · ad47332a
  Billy Donahue authored Aug 25, 2015
  
  ad47332a
- move googlemock files into googlemock/ subdir · affb09ed
  Billy Donahue authored Aug 25, 2015
  
  affb09ed
- Move everything in googletest into googletest/googletest · 1f87a097
  Billy Donahue authored Aug 25, 2015
  
  1f87a097
- Merge remote-tracking branch 'google/master' · 84b8863d
  Billy Donahue authored Aug 25, 2015
  
  84b8863d
- Merge pull request #182 from BillyDonahue/wiki · 65f381be
  Billy Donahue authored Aug 25, 2015
```
move versioned docs to version directories
```
  65f381be
- move versioned docs to version directories · 3e42adb7
  Billy Donahue authored Aug 25, 2015
  
  3e42adb7
- Merge pull request #180 from google/wiki · 07b2bd1f
  Billy Donahue authored Aug 25, 2015
```
merge wiki branch into master
```
  07b2bd1f
- Merge pull request #179 from BillyDonahue/wiki · 168ab067
  Billy Donahue authored Aug 25, 2015
```
Catch up with doc fixes from false-start repo
```
  168ab067
- readme.md updates · 06fcd9ff
  Billy Donahue authored Aug 25, 2015
  
  06fcd9ff
- README -> README.md · 36d1a71b
  Billy Donahue authored Aug 25, 2015
  
  36d1a71b
- move CheatSheet.md into docs · 872c422e
  Billy Donahue authored Aug 25, 2015
  
  872c422e
- Move all .md files from wiki into docs/ dir. · 3b6c87d4
  Billy Donahue authored Aug 25, 2015
  
  3b6c87d4
- Merge branch 'wiki' of github.com:BillyDonahue/googlemock into wiki · 26effd4a
  Billy Donahue authored Aug 25, 2015
  
  26effd4a
24 Aug, 2015 7 commits
- Migrating wiki contents from Google Code · c3d8269e
  Google Code Exporter authored Aug 24, 2015
  
  c3d8269e
- Merge pull request #506 from google/BillyDonahue-patch-1 · c8044924
  Billy Donahue authored Aug 24, 2015
```
Update README.md
```
  c8044924
- Update README.md · 09011c44
  Billy Donahue authored Aug 24, 2015
  
  09011c44
- Merge pull request #505 from BillyDonahue/import_d · dd766fb9
  Billy Donahue authored Aug 24, 2015
```
Import dhood
```
  dd766fb9
- dhood suggestions · 72d4ca66
  Billy Donahue authored Aug 24, 2015
  
  72d4ca66
- Merge pull request #7 from dhood/master · 6e981455
  Billy Donahue authored Aug 24, 2015
```
Accept dhood's readme improvement
```
  6e981455
- Correct readme links · 7f572003
  Deanna Hood authored Aug 24, 2015
  
  7f572003
22 Aug, 2015 9 commits
- Merge pull request #502 from BillyDonahue/pump_manual_fix · 5be21f85
  Billy Donahue authored Aug 22, 2015
```
Update PumpManual.md
```
  5be21f85
- Merge pull request #5 from BillyDonahue/pump_manual_fix · c9bb347f
  Billy Donahue authored Aug 22, 2015
```
Update PumpManual.md
```
  c9bb347f
- Update PumpManual.md · 0075a69b
  Billy Donahue authored Aug 22, 2015
  
  0075a69b
- Merge pull request #501 from BillyDonahue/master · 3b029de0
  Billy Donahue authored Aug 22, 2015
```
integrate doc fixes
```
  3b029de0
- Merge pull request #4 from BillyDonahue/samples_md-fix · c869561d
  Billy Donahue authored Aug 22, 2015
```
relative links to samples/
```
  c869561d
- relative links to samples/ · f26deb26
  Billy Donahue authored Aug 22, 2015
  
  f26deb26
- Merge pull request #3 from google/master · 35a6cbf3
  Billy Donahue authored Aug 22, 2015
```
Merge pull request #500 from BillyDonahue/master
```
  35a6cbf3
- Merge pull request #500 from BillyDonahue/master · 35ffecab
  Billy Donahue authored Aug 22, 2015
```
Merge pull request #2 from google/master
```
  35ffecab
- Merge pull request #2 from google/master · a3de8e8b
  Billy Donahue authored Aug 22, 2015
```
pull from google master.
```
  a3de8e8b