bryanzim
|
0e0dc8cdfb
|
Merge branch 'master' into master
|
2017-12-15 16:52:50 -05:00 |
|
Gennadiy Civil
|
3e48195784
|
Merge pull request #1354 from coryan/fix-top-level-license
Add top-level LICENSE and CONTRIBUTING.md files [skip ci]
|
2017-12-15 15:49:18 -05:00 |
|
Carlos O'Ryan
|
414af0e8a5
|
Merge branch 'fix-top-level-license' of github.com:coryan/googletest into fix-top-level-license
|
2017-12-11 19:34:19 -05:00 |
|
Carlos O'Ryan
|
3c218ff29c
|
Refactor docs about contributions to CONTRIBUTING.md.
Per the review comments.
|
2017-12-11 19:33:27 -05:00 |
|
bryanzim
|
13a4a325a5
|
Merge branch 'master' into master
|
2017-12-11 14:11:28 -05:00 |
|
Gennadiy Civil
|
0cbe36bada
|
Merge branch 'master' into fix-top-level-license
|
2017-12-11 13:13:07 -05:00 |
|
Gennadiy Civil
|
b0ed245299
|
Merge pull request #1355 from coryan/blaze-build-travis
Implement bazel-based builds in Travis.
|
2017-12-11 13:08:20 -05:00 |
|
Bryan Zimmerman
|
531d5ef77a
|
remove extra line
|
2017-12-11 12:21:35 -05:00 |
|
Bryan Zimmerman
|
4136c40a6f
|
remove implicit casts
|
2017-12-11 12:19:56 -05:00 |
|
Gennadiy Civil
|
a8e0fde335
|
Merge branch 'master' into blaze-build-travis
|
2017-12-11 10:48:12 -05:00 |
|
bryanzim
|
0fb3f4c80b
|
Merge branch 'master' into master
|
2017-12-11 09:37:55 -05:00 |
|
Gennadiy Civil
|
359a89436c
|
Merge pull request #1333 from sam-lunt/use-system-includes
Use system includes
|
2017-12-09 09:38:16 -05:00 |
|
Carlos O'Ryan
|
b835337f48
|
Also add documentation around becoming a contributor.
|
2017-12-08 23:20:55 -05:00 |
|
Carlos O'Ryan
|
040cee972e
|
Wrong LICENSE file, sorry. Corrected. [skip ci]
|
2017-12-08 23:16:46 -05:00 |
|
Carlos O'Ryan
|
71ba2c8764
|
Implement bazel-based builds in Travis.
This refactored test build scripts to enable
bazel-build scripts in Travis.
|
2017-12-08 20:59:07 -05:00 |
|
Carlos O'Ryan
|
077becb7eb
|
Add Apache-2.0 LICENSE file.
|
2017-12-08 17:24:23 -05:00 |
|
Gennadiy Civil
|
7b956df687
|
Merge branch 'master' into use-system-includes
|
2017-12-08 15:11:13 -05:00 |
|
bryanzim
|
2173579701
|
Merge branch 'master' into master
|
2017-12-08 13:11:34 -05:00 |
|
Gennadiy Civil
|
04f2b1692f
|
Merge pull request #1340 from coryan/fix-googlemock-test-build-file
Add licenses() directive for googlemock/tests.
|
2017-12-08 13:03:20 -05:00 |
|
Carlos O'Ryan
|
63723d54aa
|
Add licenses() directive for googlemock/tests.
Without the directive embedding googletest into third_party breaks
any //... target.
|
2017-12-08 12:08:25 -05:00 |
|
bryanzim
|
5845063480
|
Merge branch 'master' into master
|
2017-12-08 11:31:31 -05:00 |
|
Gennadiy Civil
|
4cc47a1a75
|
Merge pull request #1345 from coryan/fix-travis-build-macOS
Fix Travis build
|
2017-12-08 11:09:01 -05:00 |
|
Gennadiy Civil
|
a1bba746bc
|
Merge branch 'master' into fix-travis-build-macOS
|
2017-12-08 11:08:54 -05:00 |
|
Gennadiy Civil
|
95958e9f16
|
Merge pull request #1348 from wmamrak/master
Remove C4996 warning in VS2017
|
2017-12-08 11:08:17 -05:00 |
|
Wojciech Mamrak
|
8f178075b9
|
Remove C4996 warning in VS2017
|
2017-12-07 18:20:25 +01:00 |
|
Wojciech Mamrak
|
98e909ef6d
|
Improved description of VS std::tuple support
|
2017-12-07 18:18:17 +01:00 |
|
Wojciech Mamrak
|
e858bd6b7c
|
Improved description of VS std::tuple support
|
2017-12-07 18:17:43 +01:00 |
|
Carlos O'Ryan
|
5f16f9a399
|
Only switch to g++-4.9 on Linux.
|
2017-12-06 22:43:39 -05:00 |
|
bryanzim
|
902957028b
|
Merge branch 'master' into master
|
2017-12-06 11:09:00 -05:00 |
|
Gennadiy Civil
|
3cbf856bc8
|
Merge pull request #1225 from brian-peloton/master
Speed up printing of characters which need hex escaping
|
2017-12-05 17:19:23 -05:00 |
|
Gennadiy Civil
|
081432d865
|
Merge branch 'master' into master
|
2017-12-01 16:41:53 -05:00 |
|
Gennadiy Civil
|
aa5aee1235
|
Merge branch 'master' into use-system-includes
|
2017-12-01 16:29:28 -05:00 |
|
Gennadiy Civil
|
0c28ac7934
|
Merge pull request #1324 from whame/master
Fix issue #826 by treating MinGW as "non-Windows" when determining colored output
|
2017-12-01 16:27:33 -05:00 |
|
Sam Lunt
|
332bd657f9
|
make includes system
|
2017-11-27 17:31:07 -06:00 |
|
Bryan Zimmerman
|
f305481536
|
replaced back accidently removed static_cast with consistent ImplicitCast_
|
2017-11-22 09:41:32 -05:00 |
|
whame
|
d3d85627fb
|
Fixes issue #826 by treating MinGW as "non-Windows" when determining colored output
|
2017-11-07 15:22:50 +01:00 |
|
bryanzim
|
c78cb68b2a
|
Merge branch 'master' into master
|
2017-10-30 16:58:25 -04:00 |
|
Gennadiy Civil
|
4ebc9034c2
|
Merge pull request #1313 from aninf-wo/heth/fix-faq-stars-issue-1312
remove markdown stars (bold) from code examples
|
2017-10-30 11:18:33 -04:00 |
|
Gennadiy Civil
|
60ce69d807
|
Merge pull request #1308 from KindDragon/vs2017-ci
Enable CI for VS2017
|
2017-10-30 11:11:38 -04:00 |
|
Herbert Thielen
|
beabbc7da6
|
remove markdown stars (bold) from code examples
|
2017-10-29 17:12:00 +01:00 |
|
Bryan Zimmerman
|
bb417ab41e
|
fix for VS2017 deprecation of ::tr1::tuple
change static_cast to ImplicitCast_ for consitency
fixes for building with path names containing spaces
|
2017-10-27 14:01:16 -04:00 |
|
Arkady Shapkin
|
db52274f30
|
Enable CI for VS2017
|
2017-10-26 00:02:11 +03:00 |
|
Gennadiy Civil
|
cb682a5abc
|
Merge pull request #1304 from m-gupta/gtestapifix
googletest: Add GTEST_API_ attribute to ThreadLocal class.
|
2017-10-25 15:57:21 -04:00 |
|
Gennadiy Civil
|
6b060a7e30
|
Merge pull request #913 from Romain-Geissler/fix-gcc-misleading-indentation-warning
Remove gcc 6 misleading indentations warnings
|
2017-10-25 13:51:48 -04:00 |
|
m-gupta
|
30d58bcd31
|
Merge branch 'master' into gtestapifix
|
2017-10-25 10:24:56 -07:00 |
|
Romain Geissler
|
56088debda
|
Remove gcc 6 misleading indentations.
|
2017-10-25 17:53:01 +02:00 |
|
Gennadiy Civil
|
f5ce6a161f
|
Merge pull request #1218 from KindDragon/vs-build-fix
VS2015/2017 build fix and enable C++11 features (attempt number three)
|
2017-10-25 10:33:54 -04:00 |
|
Arkady Shapkin
|
a938f25467
|
Fix gmock tests when std::unary_function unavailable
|
2017-10-25 16:04:01 +03:00 |
|
Arkadiy Shapkin
|
950e2805da
|
Fix tests with VS2015 and VS2017
|
2017-10-25 16:04:01 +03:00 |
|
Arkadiy Shapkin
|
85e4858c92
|
Enable C++11 features for VS2015 and VS2017
|
2017-10-25 03:24:49 +03:00 |
|