summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | Merge branch 'master' into fix-top-level-licenseGennadiy Civil2017-12-1110-33/+313
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Refactor docs about contributions to CONTRIBUTING.md.Carlos O'Ryan2017-12-128-364/+132
| |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Also add documentation around becoming a contributor.Carlos O'Ryan2017-12-091-0/+37
| * | | | | | | | | | | | | | Wrong LICENSE file, sorry. Corrected. [skip ci]Carlos O'Ryan2017-12-091-201/+28
| * | | | | | | | | | | | | | Add Apache-2.0 LICENSE file.Carlos O'Ryan2017-12-081-0/+201
| | | | | | | | | | | | * | | Merge branch 'master' into masterbryanzim2017-12-118-29/+309
| | | | | | | | | | | | |\ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #1355 from coryan/blaze-build-travisrefs/pull/1360/headGennadiy Civil2017-12-118-29/+309
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'master' into blaze-build-travisrefs/pull/1355/headGennadiy Civil2017-12-112-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Implement bazel-based builds in Travis.Carlos O'Ryan2017-12-098-29/+309
| |/ / / / / / / / / / / / /
| | | | | | | | | | | * | | remove extra lineBryan Zimmerman2017-12-111-1/+0
| | | | | | | | | | | * | | remove implicit castsBryan Zimmerman2017-12-114-10/+8
| | | | | | | | | | | * | | Merge branch 'master' into masterrefs/pull/1311/headbryanzim2017-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-includesrefs/pull/1333/headGennadiy 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
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
| | | | | | | | | | * | | Merge branch 'master' into masterbryanzim2017-12-081-0/+2
| | | | | | | | | | |\ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #1340 from coryan/fix-googlemock-test-build-fileGennadiy Civil2017-12-081-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
| * | | | | | | | | | | | Add licenses() directive for googlemock/tests.refs/pull/1340/headCarlos O'Ryan2017-12-081-0/+2
|/ / / / / / / / / / / /
| | | | | | | | | | * | Merge branch 'master' into masterbryanzim2017-12-084-5/+7
| | | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #1345 from coryan/fix-travis-build-macOSGennadiy Civil2017-12-081-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into fix-travis-build-macOSrefs/pull/1345/headGennadiy Civil2017-12-083-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #1348 from wmamrak/masterGennadiy Civil2017-12-083-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Remove C4996 warning in VS2017refs/pull/1348/headWojciech 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-071-1/+1
|/ / / / / / / / / / / /
| | | | | | | | | | * | Merge branch 'master' into masterbryanzim2017-12-062-4/+7
| | | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #1225 from brian-peloton/masterGennadiy Civil2017-12-051-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into masterrefs/pull/1225/headGennadiy 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 ...refs/pull/1324/headwhame2017-11-071-3/+3
|/ / / / / / / / / / /
| * | | | | | | | | | Speed up printing of characters which need hex escapingBrian Silverman2017-08-281-1/+4
| | | | | | | | | * | replaced back accidently removed static_cast with consistent ImplicitCast_Bryan Zimmerman2017-11-221-1/+1
| | | | | | | | | * | Merge branch 'master' into masterbryanzim2017-10-302-4/+12
| | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #1313 from aninf-wo/heth/fix-faq-stars-issue-1312Gennadiy Civil2017-10-301-4/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | remove markdown stars (bold) from code examplesrefs/pull/1313/headHerbert Thielen2017-10-291-4/+4
* | | | | | | | | | | | Merge pull request #1308 from KindDragon/vs2017-ciGennadiy Civil2017-10-301-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Enable CI for VS2017refs/pull/1308/headArkady Shapkin2017-10-251-0/+8
|/ / / / / / / / / / /
| | | | | | | | | * | fix for VS2017 deprecation of ::tr1::tupleBryan Zimmerman2017-10-276-22/+31
| |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #1304 from m-gupta/gtestapifixGennadiy Civil2017-10-251-2/+2
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into gtestapifixrefs/pull/1304/headm-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.refs/pull/913/headRomain 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 unavailablerefs/pull/1218/headArkady 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
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |