Code

Code merging#1402

Code

Merged

gennadiycivil merged 13 commits intogoogle:mastergoogle/googletest:masterfrom gennadiycivil:masterCopy head branch name to clipboardJan 15, 2018

+25-23

Commits

Commits on Jan 15, 2018

• Code merging

  gennadiycivil

  committed
  da1f7fe

  Copy full SHA for da1f7fe

• Merge branch 'master' into master

  gennadiycivil

  authored
  822c620

  Copy full SHA for 822c620

• Merge branch 'master' of https://github.com/google/googletest

  gennadiycivil

  committed
  6c86598

  Copy full SHA for 6c86598

• More code merges

  gennadiycivil

  committed
  d629744

  Copy full SHA for d629744

• Merge branch 'master' of github.com:gennadiycivil/googletest

  gennadiycivil

  committed
  26085d7

  Copy full SHA for 26085d7

• Test files for corresponding changes

  gennadiycivil

  committed
  5f4ce9d

  Copy full SHA for 5f4ce9d

• Test files for corresponding changes

  gennadiycivil

  committed
  f45c22c

  Copy full SHA for f45c22c

• Test files for corresponding changes

  gennadiycivil

  committed
  6befe42

  Copy full SHA for 6befe42

• Test files for corresponding changes

  gennadiycivil

  committed
  304be8f

  Copy full SHA for 304be8f

• Reverting some changes, need to make the merge compile

  gennadiycivil

  committed
  b9e2978

  Copy full SHA for b9e2978

• Reverting some changes, need to make the merge compile

  gennadiycivil

  committed
  6d04de7

  Copy full SHA for 6d04de7

• Reverting some changes, need to make the merge compile

  gennadiycivil

  committed
  9195571

  Copy full SHA for 9195571

• Reverting some changes, need to make the merge compile

  gennadiycivil

  committed
  08b323f

  Copy full SHA for 08b323f