Gennadiy Civil
|
264ba3e68e
|
Merge branch 'master' of https://github.com/google/googletest
|
2018-01-24 14:59:43 -05:00 |
|
Gennadiy Civil
|
21cf836003
|
Merge pull request #1418 from gennadiycivil/master
Many code merge/upstream changes
|
2018-01-24 14:57:08 -05:00 |
|
Gennadiy Civil
|
e29805aa5d
|
upstream cl 182543808
|
2018-01-24 13:04:36 -05:00 |
|
Gennadiy Civil
|
7a2563a514
|
Merge branch 'master' of https://github.com/google/googletest
|
2018-01-24 12:36:05 -05:00 |
|
Gennadiy Civil
|
06c3cce867
|
revert, lets get this compiled
|
2018-01-24 12:14:16 -05:00 |
|
Gennadiy Civil
|
ab9c44ccf0
|
Merge pull request #1410 from pcc/win-libcxx
Check whether _MSC_VER is defined when detecting presence of cxxabi.h…
|
2018-01-24 12:07:16 -05:00 |
|
Gennadiy Civil
|
80defcec57
|
Many code merge/upstream changes
|
2018-01-23 12:33:54 -05:00 |
|
Gennadiy Civil
|
ad0146bfe2
|
Merge branch 'master' into win-libcxx
|
2018-01-23 12:32:44 -05:00 |
|
Gennadiy Civil
|
3c5e064ca0
|
Merge pull request #1417 from gennadiycivil/master
merges, cl/155419551 and others
|
2018-01-23 12:32:00 -05:00 |
|
Gennadiy Civil
|
58df576056
|
Merge branch 'master' of https://github.com/google/googletest
|
2018-01-23 10:16:38 -05:00 |
|
Gennadiy Civil
|
6723b6c588
|
Merging, upstream http://cl/182836545
|
2018-01-23 10:15:28 -05:00 |
|
Gennadiy Civil
|
bbb17ad0f7
|
more code merge
|
2018-01-22 15:28:55 -05:00 |
|
Gennadiy Civil
|
f1c87ad9f5
|
merges, cl/155419551 and other
|
2018-01-22 15:20:19 -05:00 |
|
Gennadiy Civil
|
83fa0cb17d
|
Merge pull request #1415 from gennadiycivil/master
code merge
|
2018-01-22 15:18:03 -05:00 |
|
Gennadiy Civil
|
9bc86661f8
|
more merging
|
2018-01-22 14:43:51 -05:00 |
|
Gennadiy Civil
|
a0435a54ce
|
merging
|
2018-01-22 14:14:05 -05:00 |
|
Gennadiy Civil
|
8d707dfe81
|
code merge
|
2018-01-22 11:47:30 -05:00 |
|
Gennadiy Civil
|
62ba5d91d0
|
Merge pull request #1401 from eidosmontreal/support_xboxone
Added support for WINAPI_PARTITION_TV_TITLE to support XboxOne applications
|
2018-01-19 11:59:36 -05:00 |
|
Gennadiy Civil
|
1489dc8daa
|
Merge branch 'master' into support_xboxone
|
2018-01-18 17:42:34 -05:00 |
|
Gennadiy Civil
|
20b53ad786
|
Merge branch 'master' into win-libcxx
|
2018-01-18 17:41:36 -05:00 |
|
Gennadiy Civil
|
051053054d
|
Merge pull request #1412 from gennadiycivil/master
Adding python tests to Bazel build file.
|
2018-01-18 14:52:37 -05:00 |
|
Gennadiy Civil
|
b1623e9144
|
Adding python tests to Bazel build file.
|
2018-01-18 14:32:31 -05:00 |
|
Gennadiy Civil
|
8d733dc195
|
Merge pull request #1407 from ted-xp/master
Expose ScopedTrace utility in public interface
|
2018-01-18 09:47:22 -05:00 |
|
Fedor Trushkin
|
8e862211a2
|
Use fully qualified in examples
|
2018-01-18 10:38:25 +01:00 |
|
Fedor Trushkin
|
354fc8d8b1
|
Document ScopedTrace utility
|
2018-01-18 10:34:05 +01:00 |
|
Peter Collingbourne
|
ba99a04be2
|
Check whether _MSC_VER is defined when detecting presence of cxxabi.h under libc++.
If _MSC_VER is defined, it means that we are using the Microsoft
ABI, so cxxabi.h (which is associated with the Itanium ABI) will not
be available.
|
2018-01-17 20:29:10 -08:00 |
|
Fedor Trushkin
|
9c82e7745c
|
Expose ScopedTrace utility in public interface
|
2018-01-17 16:41:59 +01:00 |
|
Gennadiy Civil
|
1b077667bd
|
Merge pull request #1402 from gennadiycivil/master
Code merging
|
2018-01-15 18:48:35 -05:00 |
|
Gennadiy Civil
|
08b323f717
|
Reverting some changes, need to make the merge compile
|
2018-01-15 18:16:11 -05:00 |
|
Gennadiy Civil
|
9195571c69
|
Reverting some changes, need to make the merge compile
|
2018-01-15 17:39:33 -05:00 |
|
Gennadiy Civil
|
6d04de7419
|
Reverting some changes, need to make the merge compile
|
2018-01-15 17:36:45 -05:00 |
|
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 |
|
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 |
|