Gennadiy Civil
|
b9e297838d
|
Reverting some changes, need to make the merge compile
|
2018-01-15 17:34:46 -05:00 |
|
Gennadiy Civil
|
304be8f009
|
Test files for corresponding changes
|
2018-01-15 17:15:52 -05:00 |
|
Gennadiy Civil
|
6befe422f2
|
Test files for corresponding changes
|
2018-01-15 16:59:57 -05:00 |
|
Gennadiy Civil
|
f45c22c482
|
Test files for corresponding changes
|
2018-01-15 16:56:17 -05:00 |
|
Gennadiy Civil
|
5f4ce9d884
|
Test files for corresponding changes
|
2018-01-15 16:46:16 -05:00 |
|
Gennadiy Civil
|
26085d7675
|
Merge branch 'master' of github.com:gennadiycivil/googletest
|
2018-01-15 16:23:37 -05:00 |
|
Gennadiy Civil
|
d629744ec0
|
More code merges
|
2018-01-15 16:23:23 -05:00 |
|
Gennadiy Civil
|
6c86598805
|
Merge branch 'master' of https://github.com/google/googletest
|
2018-01-15 16:22:59 -05:00 |
|
Gennadiy Civil
|
822c6201d3
|
Merge branch 'master' into master
|
2018-01-15 16:07:45 -05:00 |
|
Gennadiy Civil
|
da1f7fe1e7
|
Code merging
|
2018-01-15 16:06:32 -05:00 |
|
Gennadiy Civil
|
051fe2fa05
|
Merge pull request #1339 from Romain-Geissler/fix-core-dump-shared
Fix double free when building Gtest/GMock in shared libraries and lin…
|
2018-01-15 15:37:20 -05:00 |
|
Gennadiy Civil
|
f6887b5cb9
|
Merge branch 'master' into fix-core-dump-shared
|
2018-01-13 15:06:57 -05:00 |
|
Gennadiy Civil
|
63ded6c27a
|
Merge pull request #1400 from gennadiycivil/master
Upstream/merge
|
2018-01-12 21:47:26 -05:00 |
|
Conor Burgess
|
27bb844e5c
|
Merge branch 'master' into fix-argc
|
2018-01-12 16:00:39 +00:00 |
|
Gaspard Petit
|
ea8f6f0e69
|
Merge branch 'support_xboxone' of https://github.com/eidosmontreal/googletest into support_xboxone
|
2018-01-12 10:20:46 -05:00 |
|
gpetit
|
33d73d42b4
|
Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOne
|
2018-01-12 10:20:26 -05:00 |
|
Gaspard Petit
|
7ebbf59834
|
Merge branch 'support_xboxone' of https://github.com/eidosmontreal/googletest into support_xboxone
|
2018-01-12 10:20:00 -05:00 |
|
gpetit
|
569d713a39
|
Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOne
|
2018-01-12 10:18:25 -05:00 |
|
Gennadiy Civil
|
93b77987f5
|
continue upstream/merge, etc
|
2018-01-11 17:36:34 -05:00 |
|
Gennadiy Civil
|
717d784ab2
|
Merge branch 'master' of https://github.com/google/googletest
|
2018-01-11 17:17:59 -05:00 |
|
Gennadiy Civil
|
ed8d02cfc6
|
Update .travis.yml
Trying to get around mongoDB expired keys, etc
|
2018-01-11 17:03:14 -05:00 |
|
Gennadiy Civil
|
73d1251fe9
|
Update .travis.yml
|
2018-01-11 16:57:44 -05:00 |
|
Gennadiy Civil
|
cfd29e0488
|
Update .travis.yml
|
2018-01-11 16:55:21 -05:00 |
|
Gennadiy Civil
|
29f94e0106
|
Update .travis.yml
|
2018-01-11 14:57:50 -05:00 |
|
Gennadiy Civil
|
2982dc1a58
|
Trying to fix travis
|
2018-01-11 14:57:20 -05:00 |
|
Gennadiy Civil
|
13218917c8
|
Merge pull request #1399 from gennadiycivil/master
Merging, Upstream cl 103120214
|
2018-01-11 14:26:47 -05:00 |
|
Gennadiy Civil
|
5add34775c
|
Merge branch 'master' of https://github.com/google/googletest
|
2018-01-11 11:31:37 -05:00 |
|
Gennadiy Civil
|
6914ae2394
|
Upstream cl 103120214
|
2018-01-11 11:31:23 -05:00 |
|
Gennadiy Civil
|
836c419c0d
|
Merge pull request #1398 from gennadiycivil/master
more cleanup
|
2018-01-11 11:30:51 -05:00 |
|
Gennadiy Civil
|
1d757db65c
|
More merge, cleanup
|
2018-01-10 16:49:20 -05:00 |
|
Gennadiy Civil
|
b44ed21905
|
Merge branch 'master' of https://github.com/google/googletest
|
2018-01-10 16:46:21 -05:00 |
|
Gennadiy Civil
|
481fe9446a
|
More merge, cleanup
|
2018-01-10 16:45:59 -05:00 |
|
Gennadiy Civil
|
cac5d7ce1a
|
Merge pull request #1397 from gennadiycivil/master
Code Merge, upsteam of accumulated changes, cleanup
|
2018-01-10 16:09:23 -05:00 |
|
Gennadiy Civil
|
84aa45941f
|
Merge branch 'master' of https://github.com/google/googletest
|
2018-01-10 14:42:37 -05:00 |
|
Gennadiy Civil
|
6a26e47cfc
|
Code merge, upstreaming accumulated changes, cleanup
|
2018-01-10 14:42:29 -05:00 |
|
Gennadiy Civil
|
d7196896bb
|
Merge pull request #1396 from gennadiycivil/master
small cleanup/,merge
|
2018-01-10 14:35:21 -05:00 |
|
Gennadiy Civil
|
62dbaa2947
|
revert
|
2018-01-10 14:00:52 -05:00 |
|
Gennadiy Civil
|
d630a8bdac
|
code merges, cleanup
|
2018-01-10 13:58:00 -05:00 |
|
Gennadiy Civil
|
6efe104aed
|
Merge pull request #1395 from gennadiycivil/master
code merge, cleanups
|
2018-01-10 11:59:44 -05:00 |
|
Gennadiy Civil
|
f33902b97a
|
revert googletest/test/gtest-param-test_test.cc
|
2018-01-10 11:04:49 -05:00 |
|
Gennadiy Civil
|
f729a2867e
|
Merge branch 'master' of github.com:gennadiycivil/googletest
|
2018-01-10 10:57:37 -05:00 |
|
Gennadiy Civil
|
8034001188
|
Merge branch 'master' of https://github.com/google/googletest
|
2018-01-10 10:57:21 -05:00 |
|
Gennadiy Civil
|
505de1d6e2
|
Merge branch 'master' into master
|
2018-01-10 10:42:25 -05:00 |
|
Gennadiy Civil
|
6eccdb7b62
|
Update .travis.yml
|
2018-01-10 10:20:09 -05:00 |
|
Gennadiy Civil
|
2f31bfab6b
|
Merge branch 'master' of https://github.com/google/googletest
|
2018-01-09 22:47:12 -05:00 |
|
Gennadiy Civil
|
d237297ceb
|
code merge, cleanups
|
2018-01-09 22:46:17 -05:00 |
|
Gennadiy Civil
|
509e78be23
|
Merge pull request #1394 from gennadiycivil/master
wip, cleanups/merge
|
2018-01-09 20:22:14 -05:00 |
|
Gennadiy Civil
|
2ad5661db2
|
Upstream of cl 129104714
|
2018-01-09 16:41:15 -05:00 |
|
Gennadiy Civil
|
5eecadf67a
|
Revert one file
|
2018-01-09 15:46:44 -05:00 |
|
Gaspard Petit
|
5d96565ccc
|
Merge branch 'master' into support_xboxone
|
2018-01-09 15:22:30 -05:00 |
|