Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-08-01 | 19 | -41/+41 |
|\ | |||||
| * | Merge pull request #1695 from gennadiycivil/master | Gennadiy Civil | 2018-08-01 | 4 | -3/+98 |
| |\ | |||||
| | * | Merge branch 'master' into masterrefs/pull/1695/head | Gennadiy Civil | 2018-08-01 | 19 | -41/+41 |
| | |\ | | |/ | |/| | |||||
| * | | Merge pull request #1685 from einsteinsfool/master | Gennadiy Civil | 2018-08-01 | 19 | -41/+41 |
| |\ \ | |||||
| | * \ | Merge branch 'master' into masterrefs/pull/1685/head | Gennadiy Civil | 2018-07-30 | 48 | -2/+91 |
| | |\ \ | | |/ / | |/| | | |||||
| | * | | Updated broken and outdated URLs | Piotr Kąkol | 2018-07-25 | 19 | -41/+41 |
* | | | | Corresponding CMake Changes | Gennadiy Civil | 2018-08-01 | 1 | -12/+12 |
* | | | | various changes to tests | Gennadiy Civil | 2018-08-01 | 14 | -797/+334 |
* | | | | more test changes | Gennadiy Civil | 2018-08-01 | 6 | -8/+8 |
* | | | | adding googletest-json-output unitest | Gennadiy Civil | 2018-08-01 | 2 | -0/+639 |
* | | | | more test changes | Gennadiy Civil | 2018-08-01 | 5 | -311/+176 |
* | | | | more tests changes | Gennadiy Civil | 2018-08-01 | 4 | -6/+69 |
* | | | | googletest list tests unitest | Gennadiy Civil | 2018-08-01 | 3 | -12/+12 |
* | | | | gtest catch exceptions test and gtest shuffle test | Gennadiy Civil | 2018-08-01 | 6 | -25/+332 |
* | | | | changes to googletest break on failure and googletest filter unittests | Gennadiy Civil | 2018-08-01 | 7 | -31/+38 |
* | | | | changes for googletest env var test | Gennadiy Civil | 2018-08-01 | 3 | -9/+9 |
* | | | | googltest-color-test changes | Gennadiy Civil | 2018-08-01 | 3 | -7/+7 |
* | | | | googletest-output-test changes | Gennadiy Civil | 2018-08-01 | 4 | -118/+119 |
| |_|/ |/| | | |||||
* | | | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-08-01 | 0 | -0/+0 |
|\ \ \ | |/ / | |||||
| * | | Merge pull request #1691 from gennadiycivil/master | Gennadiy Civil | 2018-07-30 | 1 | -1/+1 |
| |\ \ | |||||
* | | | | Formatting changes and upstreaming one test | Gennadiy Civil | 2018-08-01 | 4 | -3/+98 |
| |/ / |/| | | |||||
* | | | Merge branch 'master' of https://github.com/google/googletestrefs/pull/1691/head | 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 commentsrefs/pull/1688/head | Gennadiy Civil | 2018-07-27 | 2 | -2/+2 |
* | | Formatting changes for automatic code management | Gennadiy Civil | 2018-07-27 | 47 | -1/+90 |
|/ | |||||
* | Merge pull request #1684 from gennadiycivil/master | Gennadiy Civil | 2018-07-25 | 4 | -7/+5 |
|\ | |||||
| * | Formatting changes, code syncrefs/pull/1684/head | 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-jprefs/pull/1606/head | 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.mdrefs/pull/1678/head | 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 pull request #1676 from gennadiycivil/master | Gennadiy Civil | 2018-07-20 | 3 | -5/+18 |
|\ \ | |||||
| * | | code mergerefs/pull/1676/head | 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_asamrefs/pull/1668/head | duxiuxing | 2018-07-19 | 2 | -7/+29 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #1674 from gennadiycivil/master | Gennadiy Civil | 2018-07-19 | 2 | -7/+29 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' into masterrefs/pull/1674/head | 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-19 | 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 feature/fix-build-error-vs2017-win10-jp | Masaru Tsuchiyama | 2018-07-18 | 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-storerefs/pull/1669/head | Gennadiy Civil | 2018-07-18 | 7 | -2122/+1722 |
| |\ \ \ \ | |/ / / / |/| | | | |