aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1355 from coryan/blaze-build-travisGennadiy Civil2017-12-118-29/+309
|\
| * Merge branch 'master' into blaze-build-travisGennadiy Civil2017-12-112-4/+4
| |\ | |/ |/|
* | Merge pull request #1333 from sam-lunt/use-system-includesGennadiy Civil2017-12-092-4/+4
|\ \
| * \ Merge branch 'master' into use-system-includesGennadiy Civil2017-12-086-2/+14
| |\ \ | |/ / |/| |
| * | Merge branch 'master' into use-system-includesGennadiy Civil2017-12-011-3/+3
| |\ \
| * | | make includes systemSam Lunt2017-11-272-4/+4
| | | * Implement bazel-based builds in Travis.Carlos O'Ryan2017-12-088-29/+309
| |_|/ |/| |
* | | Merge pull request #1340 from coryan/fix-googlemock-test-build-fileGennadiy Civil2017-12-081-0/+2
|\ \ \
| * | | Add licenses() directive for googlemock/tests.Carlos O'Ryan2017-12-081-0/+2
|/ / /
* | | Merge pull request #1345 from coryan/fix-travis-build-macOSGennadiy Civil2017-12-081-1/+1
|\ \ \
| * \ \ Merge branch 'master' into fix-travis-build-macOSGennadiy Civil2017-12-083-0/+7
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #1348 from wmamrak/masterGennadiy Civil2017-12-083-0/+7
|\ \ \ \
| * | | | Remove C4996 warning in VS2017Wojciech Mamrak2017-12-071-0/+3
| * | | | Improved description of VS std::tuple supportWojciech Mamrak2017-12-071-0/+2
| * | | | Improved description of VS std::tuple supportWojciech Mamrak2017-12-071-0/+2
|/ / / /
| * / / Only switch to g++-4.9 on Linux.Carlos O'Ryan2017-12-061-1/+1
|/ / /
* | | Merge pull request #1225 from brian-peloton/masterGennadiy Civil2017-12-051-1/+4
|\ \ \ | |_|/ |/| |
| * | Merge branch 'master' into masterGennadiy Civil2017-12-0157-334/+644
| |\ \ | |/ / |/| |
* | | Merge pull request #1324 from whame/masterGennadiy Civil2017-12-011-3/+3
|\ \ \ | |_|/ |/| |
| * | Fixes issue #826 by treating MinGW as "non-Windows" when determining colored ...whame2017-11-071-3/+3
|/ /
* | Merge pull request #1313 from aninf-wo/heth/fix-faq-stars-issue-1312Gennadiy Civil2017-10-301-4/+4
|\ \
| * | remove markdown stars (bold) from code examplesHerbert Thielen2017-10-291-4/+4
* | | Merge pull request #1308 from KindDragon/vs2017-ciGennadiy Civil2017-10-301-0/+8
|\ \ \ | |/ / |/| |
| * | Enable CI for VS2017Arkady Shapkin2017-10-261-0/+8
|/ /
* | Merge pull request #1304 from m-gupta/gtestapifixGennadiy Civil2017-10-251-2/+2
|\ \
| * \ Merge branch 'master' into gtestapifixm-gupta2017-10-258-26/+83
| |\ \
| * | | googletest: Add GTEST_API_ attribute to ThreadLocal class.Manoj Gupta2017-10-201-2/+2
* | | | Merge pull request #913 from Romain-Geissler/fix-gcc-misleading-indentation-w...Gennadiy Civil2017-10-252-13/+26
|\ \ \ \ | |_|/ / |/| | |
| * | | Remove gcc 6 misleading indentations.Romain Geissler2017-10-252-13/+26
|/ / /
* | | Merge pull request #1218 from KindDragon/vs-build-fixGennadiy Civil2017-10-257-25/+81
|\ \ \
| * | | Fix gmock tests when std::unary_function unavailableArkady Shapkin2017-10-251-2/+5
| * | | Fix tests with VS2015 and VS2017Arkadiy Shapkin2017-10-256-20/+68
| * | | Enable C++11 features for VS2015 and VS2017Arkadiy Shapkin2017-10-251-3/+8
|/ / /
* | | Merge pull request #1139 from chehsunliu/masterGennadiy Civil2017-10-241-1/+2
|\ \ \ | |/ / |/| |
| * | Merge branch 'master' into masterGennadiy Civil2017-10-2047-269/+369
| |\ \ | |/ / |/| |
* | | Merge pull request #1300 from gennadiycivil/masterGennadiy Civil2017-10-181-1/+1
|\ \ \
| * \ \ Merge branch 'master' into masterGennadiy Civil2017-10-180-0/+0
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #1298 from google/revert-1297-masterGennadiy Civil2017-10-181-2/+0
|\ \ \ \
| * | | | Revert "Workaround for Travis issue https://github.com/travis-ci/travis-ci/is...Gennadiy Civil2017-10-181-2/+0
|/ / / /
* | | | Merge pull request #1297 from gennadiycivil/masterGennadiy Civil2017-10-181-0/+2
|\ \ \ \
| | * | | Workaround for Travis issue https://goo.gl/d5eV8oGennadiy Civil2017-10-181-3/+1
| |/ / /
| * / / Workaround for Travis issue https://github.com/travis-ci/travis-ci/issues/8552Gennadiy Civil2017-10-181-0/+2
|/ / /
* | | Merge pull request #1288 from joealam/masterGennadiy Civil2017-10-151-0/+11
|\ \ \
| * | | Updated README with information about C runtime dynamic/static linking issues...Joe Alam2017-10-071-0/+11
* | | | Merge pull request #1292 from DariuszOstolski/masterGennadiy Civil2017-10-151-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | #1282: Doc typo fixDariusz Ostolski2017-10-141-1/+1
|/ / /
* | | Merge pull request #1275 from jwakely/pr/1273Gennadiy Civil2017-10-0320-22/+22
|\ \ \
| * | | Use gender-neutral pronouns in comments and docsJonathan Wakely2017-09-2720-22/+22
|/ / /
* | | Merge pull request #1249 from stkhapugin/masterGennadiy Civil2017-09-231-1/+2
|\ \ \
| * \ \ Merge branch 'master' into masterGennadiy Civil2017-09-239-162/+191
| |\ \ \ | |/ / / |/| | |