aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | | * | | | | | | | | | | | Merge branch 'master' into deprecateLoo Rong Jie2018-08-0918-72/+117
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |_|_|_|_|_|_|_|_|/ / | | | | | | |/| | | | | | | | | |
| | | | | * | | | | | | | | | | | Merge branch 'master' into deprecateGennadiy Civil2018-08-0368-358/+872
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into deprecateGennadiy Civil2018-07-3048-2/+91
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |_|_|_|_|_|_|_|_|/ / / | | | | | | |/| | | | | | | | | | |
| | | | | * | | | | | | | | | | | | Merge branch 'master' into deprecateGennadiy Civil2018-07-267-24/+16
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into deprecateGennadiy Civil2018-07-208-36/+71
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |_|_|_|_|_|_|_|_|_|/ / / | | | | | | |/| | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | Merge branch 'master' into deprecateGennadiy Civil2018-07-198-2122/+1725
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into deprecateGennadiy Civil2018-07-161-3/+2
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | Disable MSVC function deprecation when using ClangLoo Rong Jie2018-07-134-8/+24
| | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | * | | | | | | | Change location of generated pkg-config files from CMAKE_BINARY_DIR to ↵Elias Daler2018-08-132-6/+6
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gmock/gtest_BINARY_DIR (#1717)
| * | | | | | | | | | | | | | | | | | | Merge pull request #1732 from gennadiycivil/masterGennadiy Civil2018-08-131-2/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | comment cleanup
| | * | | | | | | | | | | | | | | | | | comment cleanupGennadiy Civil2018-08-131-2/+0
| |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | Merge pull request #1731 from 2power10/masterGennadiy Civil2018-08-131-55/+39
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the bad format issues in docs/advanced.md
| | * | | | | | | | | | | | | | | | | | - Fix the broken markdown tableYi Zheng2018-08-131-55/+39
| |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix some format issue
| * | | | | | | | | | | | | | | | | | Merge pull request #1727 from gennadiycivil/masterGennadiy Civil2018-08-101-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mode change on a python script
| | * | | | | | | | | | | | | | | | | | Mode change on a python scriptGennadiy Civil2018-08-101-0/+0
| |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | Update README.mdGennadiy Civil2018-08-101-2/+1
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge pull request #1726 from google/gennadiycivil-patch-2Gennadiy Civil2018-08-101-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feature forward plans - README.md
| | * | | | | | | | | | | | | | | | | | Update README.mdGennadiy Civil2018-08-101-1/+1
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Update README.mdGennadiy Civil2018-08-101-1/+1
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Update README.mdGennadiy Civil2018-08-101-1/+1
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Update README.mdGennadiy Civil2018-08-101-2/+2
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Update README.mdGennadiy Civil2018-08-101-0/+7
| |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | Merge pull request #1725 from google/gennadiycivil-patch-1Gennadiy Civil2018-08-091-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update gmock_output_test.py, formatting
| | * | | | | | | | | | | | | | | | | | Update gmock_output_test.pyGennadiy Civil2018-08-091-1/+1
| |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | Merge pull request #1719 from happyCoder92/masterGennadiy Civil2018-08-092-4/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | docs: fix broken links
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into masterGennadiy Civil2018-08-094-4/+11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | docs: fix broken linksWiktor Garbacz2018-08-092-4/+5
| | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge pull request #1724 from gennadiycivil/masterGennadiy Civil2018-08-092-11/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | formatting and small changes related to code management
| | * | | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-08-090-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge pull request #1723 from gennadiycivil/masterGennadiy Civil2018-08-092-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | code management comments,
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into masterGennadiy Civil2018-08-090-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge pull request #1721 from gennadiycivil/masterGennadiy Civil2018-08-091-3/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing identation, causes build errors when warnings are treated as errors
| | | | * | | | | | | | | | | | | | | | | | formatting and small changes related to code management, no functionality ↵Gennadiy Civil2018-08-092-11/+8
| | | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changes
| | | * / / / / / / / / / / / / / / / / / code management comments, [ci-skip], no functionality changesGennadiy Civil2018-08-092-0/+3
| | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | Fixing identation, causes build errors when warnings are treated as errorsGennadiy Civil2018-08-091-1/+2
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:gennadiycivil/googletestGennadiy Civil2018-08-091-2/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | Update gtest-death-test.ccGennadiy Civil2018-08-091-7/+9
| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Fixing identation, causes build errors when warnings are treated as errorsGennadiy Civil2018-08-091-5/+8
| | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-08-090-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge pull request #1720 from gennadiycivil/masterGennadiy Civil2018-08-091-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | Formatting change for auto code management, no functionality changes
| * | | | | | | | | | | | | | | | | | | Merge pull request #1714 from gennadiycivil/masterGennadiy Civil2018-08-0810-26/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | Formatting tweaks, no functionality changes
| | | | * | | | | | | | | | | | | | | | Fixing identation, causes build errors when warnings are treated as errorsGennadiy Civil2018-08-091-2/+2
| | | |/ / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | Merge branch 'master' of github.com:gennadiycivil/googletestGennadiy Civil2018-08-090-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge branch 'master' into masterGennadiy Civil2018-08-080-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge pull request #1713 from gennadiycivil/masterGennadiy Civil2018-08-081-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | code management changes, no functionalty changes
| | | | * | | | | | | | | | | | | | | | Formatting change for auto code management, no functionality changesGennadiy Civil2018-08-091-1/+2
| | | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/google/googletest
| | | * / / / / / / / / / / / / / / / Formatting tweaks, no functionality changesGennadiy Civil2018-08-0810-26/+24
| | |/ / / / / / / / / / / / / / / /
| | * / / / / / / / / / / / / / / / code management changes, no functionalty changesGennadiy Civil2018-08-081-0/+2
| |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Merge pull request #1710 from gennadiycivil/masterGennadiy Civil2018-08-082-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Formatting Changes and small code merge
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:gennadiycivil/googletestGennadiy Civil2018-08-080-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \