Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1355 from coryan/blaze-build-travis | Gennadiy Civil | 2017-12-11 | 8 | -29/+309 |
|\ | |||||
| * | Merge branch 'master' into blaze-build-travis | Gennadiy Civil | 2017-12-11 | 2 | -4/+4 |
| |\ | |/ |/| | |||||
* | | Merge pull request #1333 from sam-lunt/use-system-includes | Gennadiy Civil | 2017-12-09 | 2 | -4/+4 |
|\ \ | |||||
| * \ | Merge branch 'master' into use-system-includes | Gennadiy Civil | 2017-12-08 | 6 | -2/+14 |
| |\ \ | |/ / |/| | | |||||
| * | | Merge branch 'master' into use-system-includes | Gennadiy Civil | 2017-12-01 | 1 | -3/+3 |
| |\ \ | |||||
| * | | | make includes system | Sam Lunt | 2017-11-27 | 2 | -4/+4 |
| | | * | Implement bazel-based builds in Travis. | Carlos O'Ryan | 2017-12-08 | 8 | -29/+309 |
| |_|/ |/| | | |||||
* | | | Merge pull request #1340 from coryan/fix-googlemock-test-build-file | Gennadiy Civil | 2017-12-08 | 1 | -0/+2 |
|\ \ \ | |||||
| * | | | Add licenses() directive for googlemock/tests. | Carlos O'Ryan | 2017-12-08 | 1 | -0/+2 |
|/ / / | |||||
* | | | Merge pull request #1345 from coryan/fix-travis-build-macOS | Gennadiy Civil | 2017-12-08 | 1 | -1/+1 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' into fix-travis-build-macOS | Gennadiy Civil | 2017-12-08 | 3 | -0/+7 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #1348 from wmamrak/master | Gennadiy Civil | 2017-12-08 | 3 | -0/+7 |
|\ \ \ \ | |||||
| * | | | | Remove C4996 warning in VS2017 | Wojciech Mamrak | 2017-12-07 | 1 | -0/+3 |
| * | | | | Improved description of VS std::tuple support | Wojciech Mamrak | 2017-12-07 | 1 | -0/+2 |
| * | | | | Improved description of VS std::tuple support | Wojciech Mamrak | 2017-12-07 | 1 | -0/+2 |
|/ / / / | |||||
| * / / | Only switch to g++-4.9 on Linux. | Carlos O'Ryan | 2017-12-06 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #1225 from brian-peloton/master | Gennadiy Civil | 2017-12-05 | 1 | -1/+4 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Merge branch 'master' into master | Gennadiy Civil | 2017-12-01 | 57 | -334/+644 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #1324 from whame/master | Gennadiy Civil | 2017-12-01 | 1 | -3/+3 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Fixes issue #826 by treating MinGW as "non-Windows" when determining colored ... | whame | 2017-11-07 | 1 | -3/+3 |
|/ / | |||||
* | | Merge pull request #1313 from aninf-wo/heth/fix-faq-stars-issue-1312 | Gennadiy Civil | 2017-10-30 | 1 | -4/+4 |
|\ \ | |||||
| * | | remove markdown stars (bold) from code examples | Herbert Thielen | 2017-10-29 | 1 | -4/+4 |
* | | | Merge pull request #1308 from KindDragon/vs2017-ci | Gennadiy Civil | 2017-10-30 | 1 | -0/+8 |
|\ \ \ | |/ / |/| | | |||||
| * | | Enable CI for VS2017 | Arkady Shapkin | 2017-10-26 | 1 | -0/+8 |
|/ / | |||||
* | | Merge pull request #1304 from m-gupta/gtestapifix | Gennadiy Civil | 2017-10-25 | 1 | -2/+2 |
|\ \ | |||||
| * \ | Merge branch 'master' into gtestapifix | m-gupta | 2017-10-25 | 8 | -26/+83 |
| |\ \ | |||||
| * | | | googletest: Add GTEST_API_ attribute to ThreadLocal class. | Manoj Gupta | 2017-10-20 | 1 | -2/+2 |
* | | | | Merge pull request #913 from Romain-Geissler/fix-gcc-misleading-indentation-w... | Gennadiy Civil | 2017-10-25 | 2 | -13/+26 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Remove gcc 6 misleading indentations. | Romain Geissler | 2017-10-25 | 2 | -13/+26 |
|/ / / | |||||
* | | | Merge pull request #1218 from KindDragon/vs-build-fix | Gennadiy Civil | 2017-10-25 | 7 | -25/+81 |
|\ \ \ | |||||
| * | | | Fix gmock tests when std::unary_function unavailable | Arkady Shapkin | 2017-10-25 | 1 | -2/+5 |
| * | | | Fix tests with VS2015 and VS2017 | Arkadiy Shapkin | 2017-10-25 | 6 | -20/+68 |
| * | | | Enable C++11 features for VS2015 and VS2017 | Arkadiy Shapkin | 2017-10-25 | 1 | -3/+8 |
|/ / / | |||||
* | | | Merge pull request #1139 from chehsunliu/master | Gennadiy Civil | 2017-10-24 | 1 | -1/+2 |
|\ \ \ | |/ / |/| | | |||||
| * | | Merge branch 'master' into master | Gennadiy Civil | 2017-10-20 | 47 | -269/+369 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #1300 from gennadiycivil/master | Gennadiy Civil | 2017-10-18 | 1 | -1/+1 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' into master | Gennadiy Civil | 2017-10-18 | 0 | -0/+0 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #1298 from google/revert-1297-master | Gennadiy Civil | 2017-10-18 | 1 | -2/+0 |
|\ \ \ \ | |||||
| * | | | | Revert "Workaround for Travis issue https://github.com/travis-ci/travis-ci/is... | Gennadiy Civil | 2017-10-18 | 1 | -2/+0 |
|/ / / / | |||||
* | | | | Merge pull request #1297 from gennadiycivil/master | Gennadiy Civil | 2017-10-18 | 1 | -0/+2 |
|\ \ \ \ | |||||
| | * | | | Workaround for Travis issue https://goo.gl/d5eV8o | Gennadiy Civil | 2017-10-18 | 1 | -3/+1 |
| |/ / / | |||||
| * / / | Workaround for Travis issue https://github.com/travis-ci/travis-ci/issues/8552 | Gennadiy Civil | 2017-10-18 | 1 | -0/+2 |
|/ / / | |||||
* | | | Merge pull request #1288 from joealam/master | Gennadiy Civil | 2017-10-15 | 1 | -0/+11 |
|\ \ \ | |||||
| * | | | Updated README with information about C runtime dynamic/static linking issues... | Joe Alam | 2017-10-07 | 1 | -0/+11 |
* | | | | Merge pull request #1292 from DariuszOstolski/master | Gennadiy Civil | 2017-10-15 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | #1282: Doc typo fix | Dariusz Ostolski | 2017-10-14 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #1275 from jwakely/pr/1273 | Gennadiy Civil | 2017-10-03 | 20 | -22/+22 |
|\ \ \ | |||||
| * | | | Use gender-neutral pronouns in comments and docs | Jonathan Wakely | 2017-09-27 | 20 | -22/+22 |
|/ / / | |||||
* | | | Merge pull request #1249 from stkhapugin/master | Gennadiy Civil | 2017-09-23 | 1 | -1/+2 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' into master | Gennadiy Civil | 2017-09-23 | 9 | -162/+191 |
| |\ \ \ | |/ / / |/| | | |