Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into deprecate | Gennadiy Civil | 2018-08-03 | 68 | -358/+872 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into deprecate | Gennadiy Civil | 2018-07-30 | 48 | -2/+91 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into deprecate | Gennadiy Civil | 2018-07-26 | 7 | -24/+16 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into deprecate | Gennadiy Civil | 2018-07-20 | 8 | -36/+71 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into deprecate | Gennadiy Civil | 2018-07-19 | 8 | -2122/+1725 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into deprecate | Gennadiy Civil | 2018-07-16 | 1 | -3/+2 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable MSVC function deprecation when using Clang | Loo Rong Jie | 2018-07-13 | 4 | -8/+24 | |
| | | | | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | Change location of generated pkg-config files from CMAKE_BINARY_DIR to gmock/... | Elias Daler | 2018-08-13 | 2 | -6/+6 | |
| | | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | | | | | | | | * | | | | | | | | | | | | | | | | | | | | | | | Ignore cmake generated files when used as submodule | wxf | 2018-08-03 | 1 | -0/+11 | |
| | | | | | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | | Merge branch 'master' into josh/fix_scoped_class2 | Josh Bodily | 2017-12-12 | 106 | -1638/+3215 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ | ||||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ | Merge branch 'master' into josh/fix_scoped_class2 | Josh Bodily | 2017-08-16 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ | ||||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ | Merge branch 'master' into josh/fix_scoped_class2 | Josh Bodily | 2017-08-16 | 71 | -26794/+681 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ | ||||||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | | | | | Fix scoped enum not working in gmock-gen.py | Josh Bodily | 2017-08-10 | 2 | -0/+21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | It seems like CMAKE_CXX_FLAGS is getting double appended when building as a n... | Jacob Schloss | 2018-08-22 | 1 | -1/+1 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #924 from wind-river-cdt/cross-testing-patch-1 | Gennadiy Civil | 2018-08-13 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into cross-testing-patch-1refs/pull/924/head | Gennadiy Civil | 2018-08-13 | 21 | -103/+94 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #1732 from gennadiycivil/master | Gennadiy Civil | 2018-08-13 | 1 | -2/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | comment cleanuprefs/pull/1732/head | Gennadiy Civil | 2018-08-13 | 1 | -2/+0 | |
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #1731 from 2power10/master | Gennadiy Civil | 2018-08-13 | 1 | -55/+39 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix the broken markdown tablerefs/pull/1731/head | Yi Zheng | 2018-08-13 | 1 | -55/+39 | |
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #1727 from gennadiycivil/master | Gennadiy Civil | 2018-08-10 | 1 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mode change on a python scriptrefs/pull/1727/head | Gennadiy Civil | 2018-08-10 | 1 | -0/+0 | |
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update README.md | Gennadiy Civil | 2018-08-10 | 1 | -2/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #1726 from google/gennadiycivil-patch-2 | Gennadiy Civil | 2018-08-10 | 1 | -0/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update README.mdrefs/pull/1726/head | Gennadiy Civil | 2018-08-10 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update README.md | Gennadiy Civil | 2018-08-10 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update README.md | Gennadiy Civil | 2018-08-10 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update README.md | Gennadiy Civil | 2018-08-10 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update README.md | Gennadiy Civil | 2018-08-10 | 1 | -0/+7 | |
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #1725 from google/gennadiycivil-patch-1 | Gennadiy Civil | 2018-08-09 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update gmock_output_test.pyrefs/pull/1725/head | Gennadiy Civil | 2018-08-09 | 1 | -1/+1 | |
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #1719 from happyCoder92/master | Gennadiy Civil | 2018-08-09 | 2 | -4/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into masterrefs/pull/1719/head | Gennadiy Civil | 2018-08-09 | 4 | -4/+11 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | docs: fix broken links | Wiktor Garbacz | 2018-08-09 | 2 | -4/+5 | |
| | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #1724 from gennadiycivil/master | Gennadiy Civil | 2018-08-09 | 2 | -11/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/google/googletestrefs/pull/1724/head | Gennadiy Civil | 2018-08-09 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #1723 from gennadiycivil/master | Gennadiy Civil | 2018-08-09 | 2 | -0/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into masterrefs/pull/1723/head | Gennadiy Civil | 2018-08-09 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #1721 from gennadiycivil/master | Gennadiy Civil | 2018-08-09 | 1 | -3/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | formatting and small changes related to code management, no functionality cha... | Gennadiy Civil | 2018-08-09 | 2 | -11/+8 | |
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | code management comments, [ci-skip], no functionality changes | Gennadiy Civil | 2018-08-09 | 2 | -0/+3 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing identation, causes build errors when warnings are treated as errorsrefs/pull/1721/head | Gennadiy Civil | 2018-08-09 | 1 | -1/+2 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:gennadiycivil/googletest | Gennadiy Civil | 2018-08-09 | 1 | -2/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update gtest-death-test.cc | Gennadiy Civil | 2018-08-09 | 1 | -7/+9 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing identation, causes build errors when warnings are treated as errors | Gennadiy Civil | 2018-08-09 | 1 | -5/+8 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-08-09 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #1720 from gennadiycivil/master | Gennadiy Civil | 2018-08-09 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #1714 from gennadiycivil/master | Gennadiy Civil | 2018-08-08 | 10 | -26/+24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing identation, causes build errors when warnings are treated as errors | Gennadiy Civil | 2018-08-09 | 1 | -2/+2 | |
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:gennadiycivil/googletestrefs/pull/1720/head | Gennadiy Civil | 2018-08-09 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |