Gennadiy Civil
|
017dd4d37d
|
Merge pull request #1407 from ted-xp/master
Expose ScopedTrace utility in public interface
|
2018-01-18 09:47:22 -05:00 |
|
Fedor Trushkin
|
60922662fe
|
Use fully qualified in examples
|
2018-01-18 10:38:25 +01:00 |
|
Fedor Trushkin
|
920639122c
|
Document ScopedTrace utility
|
2018-01-18 10:34:05 +01:00 |
|
Fedor Trushkin
|
4e1156e10c
|
Expose ScopedTrace utility in public interface
|
2018-01-17 16:41:59 +01:00 |
|
Gennadiy Civil
|
ffcabbd844
|
Merge pull request #1402 from gennadiycivil/master
Code merging
|
2018-01-15 18:48:35 -05:00 |
|
Gennadiy Civil
|
81b270392c
|
Reverting some changes, need to make the merge compile
|
2018-01-15 18:16:11 -05:00 |
|
Gennadiy Civil
|
01e9531d3e
|
Reverting some changes, need to make the merge compile
|
2018-01-15 17:39:33 -05:00 |
|
Gennadiy Civil
|
9faac7603b
|
Reverting some changes, need to make the merge compile
|
2018-01-15 17:36:45 -05:00 |
|
Gennadiy Civil
|
a4e5067656
|
Reverting some changes, need to make the merge compile
|
2018-01-15 17:34:46 -05:00 |
|
Gennadiy Civil
|
8cd0c8c4da
|
Test files for corresponding changes
|
2018-01-15 17:15:52 -05:00 |
|
Gennadiy Civil
|
3c6e143b62
|
Test files for corresponding changes
|
2018-01-15 16:59:57 -05:00 |
|
Gennadiy Civil
|
0508f6d082
|
Test files for corresponding changes
|
2018-01-15 16:56:17 -05:00 |
|
Gennadiy Civil
|
338c211250
|
Test files for corresponding changes
|
2018-01-15 16:46:16 -05:00 |
|
Gennadiy Civil
|
b47f3b370b
|
Merge branch 'master' of github.com:gennadiycivil/googletest
|
2018-01-15 16:23:37 -05:00 |
|
Gennadiy Civil
|
c06b7f29cd
|
More code merges
|
2018-01-15 16:23:23 -05:00 |
|
Gennadiy Civil
|
be4ac23eb5
|
Merge branch 'master' of https://github.com/google/googletest
|
2018-01-15 16:22:59 -05:00 |
|
Gennadiy Civil
|
96098b6ae6
|
Merge branch 'master' into master
|
2018-01-15 16:07:45 -05:00 |
|
Gennadiy Civil
|
153f625dd3
|
Code merging
|
2018-01-15 16:06:32 -05:00 |
|
Gennadiy Civil
|
f03a03f8c4
|
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
|
cdf810f53c
|
Merge branch 'master' into fix-core-dump-shared
|
2018-01-13 15:06:57 -05:00 |
|
Gennadiy Civil
|
a5e0d37e6c
|
Merge pull request #1400 from gennadiycivil/master
Upstream/merge
|
2018-01-12 21:47:26 -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 |
|