Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into deprecate | Gennadiy Civil | 2018-07-30 | 48 | -2/+91 |
|\ | |||||
| * | Merge pull request #1691 from gennadiycivil/master | Gennadiy Civil | 2018-07-30 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-07-30 | 0 | -0/+0 |
| | |\ | | |/ | |/| | |||||
| * | | Merge pull request #1688 from gennadiycivil/master | Gennadiy Civil | 2018-07-27 | 47 | -1/+90 |
| |\ \ | |||||
| | | * | small tweaks, OSS merge cl 206357486 | Gennadiy Civil | 2018-07-30 | 1 | -1/+1 |
| | |/ | |||||
| | * | added missing comments | Gennadiy Civil | 2018-07-27 | 2 | -2/+2 |
| | * | Formatting changes for automatic code management | Gennadiy Civil | 2018-07-27 | 47 | -1/+90 |
| |/ | |||||
* | | Merge branch 'master' into deprecate | Gennadiy Civil | 2018-07-26 | 7 | -24/+16 |
|\| | |||||
| * | Merge pull request #1684 from gennadiycivil/master | Gennadiy Civil | 2018-07-25 | 4 | -7/+5 |
| |\ | |||||
| | * | Formatting changes, code sync | Gennadiy Civil | 2018-07-25 | 4 | -7/+5 |
| |/ | |||||
| * | Merge pull request #1606 from m-tmatma/feature/fix-build-error-vs2017-win10-jp | Gennadiy Civil | 2018-07-24 | 2 | -4/+4 |
| |\ | |||||
| | * | Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp | Gennadiy Civil | 2018-07-23 | 1 | -13/+7 |
| | |\ | | |/ | |/| | |||||
| * | | Merge pull request #1678 from stianval/master | Gennadiy Civil | 2018-07-23 | 1 | -13/+7 |
| |\ \ | |||||
| | * | | Update primer.md | Stian Valle | 2018-07-21 | 1 | -12/+6 |
| | * | | Update primer.md | Stian Valle | 2018-07-21 | 1 | -12/+12 |
| | * | | Update primer.md | Stian Valle | 2018-07-21 | 1 | -7/+7 |
| |/ / | |||||
| | * | Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp | Masaru Tsuchiyama | 2018-07-21 | 6 | -32/+67 |
| | |\ | | |/ | |/| | |||||
| | * | Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp | Masaru Tsuchiyama | 2018-07-19 | 8 | -2122/+1725 |
| | |\ | |||||
| | * \ | Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp | Masaru Tsuchiyama | 2018-07-18 | 14 | -376/+785 |
| | |\ \ | |||||
| | * | | | This closes #1595: fix compiler error with Visual Studio 2017 on Win10 JP. | Masaru Tsuchiyama | 2018-06-30 | 2 | -8/+8 |
* | | | | | Merge branch 'master' into deprecate | Gennadiy Civil | 2018-07-20 | 8 | -36/+71 |
|\| | | | | |||||
| * | | | | Merge pull request #1676 from gennadiycivil/master | Gennadiy Civil | 2018-07-20 | 3 | -5/+18 |
| |\ \ \ \ | |||||
| | * | | | | code merge | Gennadiy Civil | 2018-07-20 | 3 | -5/+18 |
| |/ / / / | |||||
| * | | | | Merge pull request #1668 from duxiuxing/googletest_for_asam | Gennadiy Civil | 2018-07-20 | 5 | -25/+25 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'master' into googletest_for_asam | duxiuxing | 2018-07-20 | 2 | -7/+29 |
| | |\ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Merge pull request #1674 from gennadiycivil/master | Gennadiy Civil | 2018-07-19 | 2 | -7/+29 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| | * | | | | Merge branch 'master' into master | Gennadiy Civil | 2018-07-19 | 1 | -0/+3 |
| | |\ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | code sync | Gennadiy Civil | 2018-07-19 | 2 | -4/+9 |
| | * | | | | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-07-18 | 0 | -0/+0 |
| | |\ \ \ \ | |||||
| | * | | | | | Code sync | Gennadiy Civil | 2018-07-18 | 1 | -3/+20 |
| | | | * | | | Replace "…" with "..."(three dots) to fix warning C4819 in Visual Studio | 杜修杏 | 2018-07-20 | 2 | -4/+4 |
| | | | * | | | Merge branch 'master' into googletest_for_asam | duxiuxing | 2018-07-19 | 8 | -2122/+1725 |
| | | | |\ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| | | | * | | | Fix warning C4819: The file contains a character that cannot be represented i... | duxiuxing | 2018-07-17 | 3 | -21/+21 |
| | | | | |/ | | | | |/| | |||||
* | | | | | | Merge branch 'master' into deprecate | Gennadiy Civil | 2018-07-19 | 8 | -2122/+1725 |
|\| | | | | | |||||
| * | | | | | Merge pull request #1669 from syohex/ignore-ds-store | Gennadiy Civil | 2018-07-18 | 1 | -0/+3 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | Merge branch 'master' into ignore-ds-store | Gennadiy Civil | 2018-07-18 | 7 | -2122/+1722 |
| | |\ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Merge pull request #1671 from gennadiycivil/master | Gennadiy Civil | 2018-07-18 | 4 | -205/+4 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Fix link | Gennadiy Civil | 2018-07-18 | 1 | -1/+1 |
| | * | | | | Code sync, mostly formatting and removing outdates | Gennadiy Civil | 2018-07-18 | 2 | -203/+2 |
| | * | | | | Formatting and a link | Gennadiy Civil | 2018-07-18 | 3 | -3/+3 |
| |/ / / / | |||||
| * | | | | Merge pull request #1667 from hckr/patch-1 | Gennadiy Civil | 2018-07-18 | 1 | -2/+2 |
| |\ \ \ \ | |||||
| | * | | | | Fix broken links to FAQ in primer.md | Jakub Młokosiewicz | 2018-07-17 | 1 | -2/+2 |
| | | |/ / | | |/| | | |||||
| * | | | | Merge pull request #1670 from gennadiycivil/master | Gennadiy Civil | 2018-07-18 | 3 | -1915/+1716 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-07-17 | 12 | -57/+423 |
| | |\ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Docs sync | Gennadiy Civil | 2018-07-17 | 3 | -1915/+1716 |
| | | * | | Ignore .DS_Store file | Syohei YOSHIDA | 2018-07-17 | 1 | -0/+3 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'master' into deprecate | Gennadiy Civil | 2018-07-16 | 1 | -3/+2 |
|\| | | | |||||
| * | | | Merge pull request #1655 from AdrianMoranMontes/master | Gennadiy Civil | 2018-07-16 | 1 | -3/+2 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'master' into master | Adrian Moran | 2018-07-13 | 10 | -53/+420 |
| | |\ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Put ifdef guard after the includes. | Adrian Moran | 2018-07-13 | 1 | -1/+1 |