aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1697 from morris-stock/ignore-cmake-generated-filesGennadiy Civil2018-08-151-0/+11
|\
| * Merge branch 'master' into ignore-cmake-generated-filesGennadiy Civil2018-08-15178-628/+480
| |\ | |/ |/|
* | Merge pull request #1734 from eliasdaler/cmake-binary-dir-fixGennadiy Civil2018-08-152-6/+6
|\ \
| * \ Merge branch 'master' into cmake-binary-dir-fixGennadiy Civil2018-08-1449-103/+64
| |\ \ | |/ / |/| |
* | | Merge pull request #1741 from gennadiycivil/masterGennadiy Civil2018-08-1449-103/+64
|\ \ \
| * | | more comments changesGennadiy Civil2018-08-143-5/+3
| * | | more comments changesGennadiy Civil2018-08-144-4/+4
| * | | Comments changes, no functionality changes. Gennadiy Civil2018-08-1447-98/+61
|/ / /
| * | Merge branch 'master' into cmake-binary-dir-fixGennadiy Civil2018-08-14152-371/+224
| |\ \ | |/ / |/| |
* | | Merge pull request #1740 from gennadiycivil/masterGennadiy Civil2018-08-14144-289/+115
|\ \ \
| * | | Comments changes, no functionality changesGennadiy Civil2018-08-14144-289/+115
|/ / /
* | | Merge pull request #1665 from rongjiecomputer/deprecateGennadiy Civil2018-08-144-8/+24
|\ \ \
| * \ \ Merge branch 'master' into deprecateGennadiy Civil2018-08-1421-151/+155
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #1738 from gennadiycivil/masterGennadiy Civil2018-08-144-15/+6
|\ \ \ \
| * | | | Code formatting changes, clean up, no functionality changesGennadiy Civil2018-08-144-15/+6
|/ / / /
* | | | Merge pull request #1733 from gennadiycivil/masterGennadiy Civil2018-08-147-58/+78
|\ \ \ \
| * \ \ \ Merge branch 'master' into masterGennadiy Civil2018-08-141-1/+1
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #924 from wind-river-cdt/cross-testing-patch-1Gennadiy Civil2018-08-131-1/+1
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into cross-testing-patch-1Gennadiy Civil2018-08-1321-103/+94
| |\ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch 'master' into cross-testing-patch-1Gennadiy Civil2018-08-08311-36369/+19148
| |\ \ \ \ \
| * | | | | | Fix #923 - support CMAKE_CROSSCOMPILING_EMULATOR for testsMartin Oberhuber2016-11-051-1/+1
| | | * | | | formatting custom/README.mdGennadiy Civil2018-08-132-11/+11
| | | * | | | formatting for new READMEsGennadiy Civil2018-08-132-28/+28
| | | * | | | Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-08-130-0/+0
| | | |\ \ \ \ | |_|_|/ / / / |/| | | | | |
| | | * | | | Move instructions into custom/README filesGennadiy Civil2018-08-137-58/+78
| | | | * | | 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 gmock/...Elias Daler2018-08-132-6/+6
| |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #1732 from gennadiycivil/masterGennadiy Civil2018-08-131-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | comment cleanupGennadiy Civil2018-08-131-2/+0
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #1731 from 2power10/masterGennadiy Civil2018-08-131-55/+39
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | - Fix the broken markdown tableYi Zheng2018-08-131-55/+39
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #1727 from gennadiycivil/masterGennadiy Civil2018-08-101-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | 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.pyGennadiy Civil2018-08-091-1/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #1719 from happyCoder92/masterGennadiy Civil2018-08-092-4/+5
|\ \ \ \ \ \ \ \ \ \ \ \