Gaspard Petit
|
f12d4da7ed
|
Merge branch 'support_xboxone' of https://github.com/eidosmontreal/googletest into support_xboxone
|
2018-01-12 10:20:46 -05:00 |
|
gpetit
|
25a2ba9501
|
Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOne
|
2018-01-12 10:20:26 -05:00 |
|
Gaspard Petit
|
83b9e72496
|
Merge branch 'support_xboxone' of https://github.com/eidosmontreal/googletest into support_xboxone
|
2018-01-12 10:20:00 -05:00 |
|
gpetit
|
8c2e854f09
|
Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOne
|
2018-01-12 10:18:25 -05:00 |
|
Gennadiy Civil
|
9b205752b2
|
continue upstream/merge, etc
|
2018-01-11 17:36:34 -05:00 |
|
Gennadiy Civil
|
92d91cd443
|
Merge branch 'master' of https://github.com/google/googletest
|
2018-01-11 17:17:59 -05:00 |
|
Gennadiy Civil
|
c51d6cb4c8
|
Update .travis.yml
Trying to get around mongoDB expired keys, etc
|
2018-01-11 17:03:14 -05:00 |
|
Gennadiy Civil
|
92417645ac
|
Update .travis.yml
|
2018-01-11 16:57:44 -05:00 |
|
Gennadiy Civil
|
00c177c196
|
Update .travis.yml
|
2018-01-11 16:55:21 -05:00 |
|
Gennadiy Civil
|
ebdbba19b7
|
Update .travis.yml
|
2018-01-11 14:57:50 -05:00 |
|
Gennadiy Civil
|
3dcb79d1ec
|
Trying to fix travis
|
2018-01-11 14:57:20 -05:00 |
|
Gennadiy Civil
|
869607bdbb
|
Merge pull request #1399 from gennadiycivil/master
Merging, Upstream cl 103120214
|
2018-01-11 14:26:47 -05:00 |
|
Gennadiy Civil
|
0a048ede47
|
Merge branch 'master' of https://github.com/google/googletest
|
2018-01-11 11:31:37 -05:00 |
|
Gennadiy Civil
|
4c0c906987
|
Upstream cl 103120214
|
2018-01-11 11:31:23 -05:00 |
|
Gennadiy Civil
|
0329ffbcd7
|
Merge pull request #1398 from gennadiycivil/master
more cleanup
|
2018-01-11 11:30:51 -05:00 |
|
Gennadiy Civil
|
ee7f9fd88e
|
More merge, cleanup
|
2018-01-10 16:49:20 -05:00 |
|
Gennadiy Civil
|
b444fe9b74
|
Merge branch 'master' of https://github.com/google/googletest
|
2018-01-10 16:46:21 -05:00 |
|
Gennadiy Civil
|
4695a1108e
|
More merge, cleanup
|
2018-01-10 16:45:59 -05:00 |
|
Gennadiy Civil
|
77ebe005d4
|
Merge pull request #1397 from gennadiycivil/master
Code Merge, upsteam of accumulated changes, cleanup
|
2018-01-10 16:09:23 -05:00 |
|
Gennadiy Civil
|
dd7620090a
|
Merge branch 'master' of https://github.com/google/googletest
|
2018-01-10 14:42:37 -05:00 |
|
Gennadiy Civil
|
091c46ed6e
|
Code merge, upstreaming accumulated changes, cleanup
|
2018-01-10 14:42:29 -05:00 |
|
Gennadiy Civil
|
fe1908fc6f
|
Merge pull request #1396 from gennadiycivil/master
small cleanup/,merge
|
2018-01-10 14:35:21 -05:00 |
|
Gennadiy Civil
|
a230988e5b
|
revert
|
2018-01-10 14:00:52 -05:00 |
|
Gennadiy Civil
|
9fc04da090
|
code merges, cleanup
|
2018-01-10 13:58:00 -05:00 |
|
Gennadiy Civil
|
03e20771e6
|
Merge pull request #1395 from gennadiycivil/master
code merge, cleanups
|
2018-01-10 11:59:44 -05:00 |
|
Gennadiy Civil
|
e7c35b2539
|
revert googletest/test/gtest-param-test_test.cc
|
2018-01-10 11:04:49 -05:00 |
|
Gennadiy Civil
|
67bbe10978
|
Merge branch 'master' of github.com:gennadiycivil/googletest
|
2018-01-10 10:57:37 -05:00 |
|
Gennadiy Civil
|
2d3fab795d
|
Merge branch 'master' of https://github.com/google/googletest
|
2018-01-10 10:57:21 -05:00 |
|
Gennadiy Civil
|
6c52b2b73a
|
Merge branch 'master' into master
|
2018-01-10 10:42:25 -05:00 |
|
Gennadiy Civil
|
a3736d2166
|
Update .travis.yml
|
2018-01-10 10:20:09 -05:00 |
|
Gennadiy Civil
|
bdf3cfb0f4
|
Merge branch 'master' of https://github.com/google/googletest
|
2018-01-09 22:47:12 -05:00 |
|
Gennadiy Civil
|
28368f8f74
|
code merge, cleanups
|
2018-01-09 22:46:17 -05:00 |
|
Gennadiy Civil
|
45069e9e31
|
Merge pull request #1394 from gennadiycivil/master
wip, cleanups/merge
|
2018-01-09 20:22:14 -05:00 |
|
Gennadiy Civil
|
9b54fda880
|
Upstream of cl 129104714
|
2018-01-09 16:41:15 -05:00 |
|
Gennadiy Civil
|
062f5f05b3
|
Revert one file
|
2018-01-09 15:46:44 -05:00 |
|
Gaspard Petit
|
ab9d22d454
|
Merge branch 'master' into support_xboxone
|
2018-01-09 15:22:30 -05:00 |
|
Gennadiy Civil
|
823b5a8545
|
wip, cleanups/merge
|
2018-01-09 14:48:06 -05:00 |
|
Gennadiy Civil
|
f328db661a
|
Merge pull request #1393 from gennadiycivil/master
cleanup, merge
|
2018-01-09 14:45:55 -05:00 |
|
Gennadiy Civil
|
2a8d1eabc0
|
Merge branch 'master' into master
|
2018-01-09 14:00:25 -05:00 |
|
Gennadiy Civil
|
00b42ec5c3
|
cleanup, merge
|
2018-01-09 13:59:27 -05:00 |
|
Gennadiy Civil
|
7b54e1227c
|
Merge branch 'master' into fix-core-dump-shared
|
2018-01-09 00:22:32 -05:00 |
|
Gennadiy Civil
|
f858df5aab
|
Merge pull request #1388 from rongjiecomputer/bazel
[Bazel] Detect Windows with cpu value x64_windows and x64_windows_msvc
|
2018-01-08 22:07:26 -05:00 |
|
Loo Rong Jie
|
15605813a5
|
[Bazel] Detect Windows with cpu value x64_windows and x64_windows_msvc
and x64_windows_msvc
|
2018-01-09 08:29:44 +08:00 |
|
Gennadiy Civil
|
a0270937d6
|
Merge pull request #1390 from gennadiycivil/master
Small cleanups, merge
|
2018-01-08 17:10:16 -05:00 |
|
Gennadiy Civil
|
59c57226dc
|
Small cleanups, merge
|
2018-01-08 16:14:06 -05:00 |
|
Gennadiy Civil
|
0698036d29
|
Merge pull request #1387 from coryan/optimize-build-matrix-ready
Optimize build matrix on pull requests
|
2018-01-08 10:50:13 -05:00 |
|
Gennadiy Civil
|
65eb0d3fe2
|
Merge pull request #1385 from gennadiycivil/master
code cleanup in preparation for merges, cl 180857299
|
2018-01-06 00:02:40 -05:00 |
|
Gennadiy Civil
|
40c3187116
|
Merge branch 'master' into master
|
2018-01-05 15:34:07 -05:00 |
|
Carlos O'Ryan
|
a7db01b2c0
|
Use correct name for build event types.
|
2018-01-05 14:58:48 -05:00 |
|
Gennadiy Civil
|
88a9c878c2
|
Revert one file for now
|
2018-01-05 12:35:41 -05:00 |
|