| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | * | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-01-24 | 1 | -1/+1 | |
| | |/| | |/ |/| | ||||||
| * | | Merge pull request #1410 from pcc/win-libcxx | Gennadiy Civil | 2018-01-24 | 1 | -1/+1 | |
| |\ \ | | | | | | | Check whether _MSC_VER is defined when detecting presence of cxxabi.h… | |||||
| | * \ | Merge branch 'master' into win-libcxx | Gennadiy Civil | 2018-01-23 | 15 | -84/+117 | |
| | |\ \ | |/ / |/| | | ||||||
| * | | | Merge pull request #1417 from gennadiycivil/master | Gennadiy Civil | 2018-01-23 | 8 | -40/+71 | |
| |\ \ \ | | | | | | | | | merges, cl/155419551 and others | |||||
| | | * \ | Merge branch 'master' into win-libcxx | Gennadiy Civil | 2018-01-18 | 8 | -78/+346 | |
| | | |\ \ | ||||||
| | | * | | | Check whether _MSC_VER is defined when detecting presence of cxxabi.h under ↵ | Peter Collingbourne | 2018-01-17 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||||
| | | | | * | revert, lets get this compiled | Gennadiy Civil | 2018-01-24 | 1 | -46/+3 | |
| | | | | | | ||||||
| | | | | * | Many code merge/upstream changes | Gennadiy Civil | 2018-01-23 | 16 | -35/+93 | |
| | | |_|/ | |/| | | ||||||
| | * | | | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-01-23 | 0 | -0/+0 | |
| | |\ \ \ | |/ / / |/| | | | ||||||
| * | | | | Merge pull request #1415 from gennadiycivil/master | Gennadiy Civil | 2018-01-22 | 7 | -43/+42 | |
| |\ \ \ \ | | | | | | | | | | | code merge | |||||
| | | * | | | Merging, upstream http://cl/182836545 | Gennadiy Civil | 2018-01-23 | 5 | -10/+8 | |
| | | | | | | ||||||
| | | * | | | more code merge | Gennadiy Civil | 2018-01-22 | 1 | -3/+1 | |
| | | | | | | ||||||
| | | * | | | merges, cl/155419551 and other | Gennadiy Civil | 2018-01-22 | 4 | -27/+62 | |
| | |/ / / | ||||||
| | * | | | more merging | Gennadiy Civil | 2018-01-22 | 2 | -6/+4 | |
| | | | | | ||||||
| | * | | | merging | Gennadiy Civil | 2018-01-22 | 1 | -2/+2 | |
| | | | | | ||||||
| | * | | | code merge | Gennadiy Civil | 2018-01-22 | 8 | -43/+44 | |
| |/ / / | ||||||
| * | | | Merge pull request #1401 from eidosmontreal/support_xboxone | Gennadiy Civil | 2018-01-19 | 2 | -1/+4 | |
| |\ \ \ | |_|/ |/| | | Added support for WINAPI_PARTITION_TV_TITLE to support XboxOne applications | |||||
| | * | | Merge branch 'master' into support_xboxone | Gennadiy Civil | 2018-01-18 | 10 | -128/+415 | |
| | |\ \ | |/ / |/| | | ||||||
| * | | | Merge pull request #1412 from gennadiycivil/master | Gennadiy Civil | 2018-01-18 | 1 | -1/+243 | |
| |\ \ \ | | | | | | | | | Adding python tests to Bazel build file. | |||||
| | * | | | Adding python tests to Bazel build file. | Gennadiy Civil | 2018-01-18 | 1 | -1/+243 | |
| |/ / / | ||||||
| * | | | Merge pull request #1407 from ted-xp/master | Gennadiy Civil | 2018-01-18 | 7 | -77/+103 | |
| |\ \ \ | |_|/ |/| | | Expose ScopedTrace utility in public interface | |||||
| | * | | Use fully qualified in examples | Fedor Trushkin | 2018-01-18 | 1 | -2/+2 | |
| | | | | ||||||
| | * | | Document ScopedTrace utility | Fedor Trushkin | 2018-01-18 | 1 | -7/+9 | |
| | | | | ||||||
| | * | | Expose ScopedTrace utility in public interface | Fedor Trushkin | 2018-01-17 | 6 | -70/+94 | |
| |/ / | ||||||
| * | | Merge pull request #1402 from gennadiycivil/master | Gennadiy Civil | 2018-01-15 | 2 | -23/+25 | |
| |\ \ | | | | | | | Code merging | |||||
| | * | | Reverting some changes, need to make the merge compile | Gennadiy Civil | 2018-01-15 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Reverting some changes, need to make the merge compile | Gennadiy Civil | 2018-01-15 | 1 | -2/+3 | |
| | | | | ||||||
| | * | | Reverting some changes, need to make the merge compile | Gennadiy Civil | 2018-01-15 | 1 | -1/+0 | |
| | | | | ||||||
| | * | | Reverting some changes, need to make the merge compile | Gennadiy Civil | 2018-01-15 | 2 | -53/+12 | |
| | | | | ||||||
| | * | | Test files for corresponding changes | Gennadiy Civil | 2018-01-15 | 1 | -0/+2 | |
| | | | | ||||||
| | * | | Test files for corresponding changes | Gennadiy Civil | 2018-01-15 | 1 | -6/+9 | |
| | | | | ||||||
| | * | | Test files for corresponding changes | Gennadiy Civil | 2018-01-15 | 1 | -5/+25 | |
| | | | | ||||||
| | * | | Test files for corresponding changes | Gennadiy Civil | 2018-01-15 | 1 | -0/+13 | |
| | | | | ||||||
| | * | | Merge branch 'master' of github.com:gennadiycivil/googletest | Gennadiy Civil | 2018-01-15 | 0 | -0/+0 | |
| | |\ \ | ||||||
| | | * \ | Merge branch 'master' into master | Gennadiy Civil | 2018-01-15 | 1 | -23/+40 | |
| | | |\ \ | |_|/ / |/| | | | ||||||
| | * | | | More code merges | Gennadiy Civil | 2018-01-15 | 1 | -18/+15 | |
| | | | | | ||||||
| | * | | | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-01-15 | 1 | -23/+40 | |
| | |\ \ \ | |/ / / |/| / / | |/ / | ||||||
| * | | | Merge pull request #1339 from Romain-Geissler/fix-core-dump-shared | Gennadiy Civil | 2018-01-15 | 1 | -23/+40 | |
| |\ \ \ | | | | | | | | | Fix double free when building Gtest/GMock in shared libraries and lin… | |||||
| | * \ \ | Merge branch 'master' into fix-core-dump-shared | Gennadiy Civil | 2018-01-13 | 22 | -154/+180 | |
| | |\ \ \ | |/ / / |/| | | | ||||||
| * | | | | Merge pull request #1400 from gennadiycivil/master | Gennadiy Civil | 2018-01-12 | 1 | -4/+4 | |
| |\ \ \ \ | | | | | | | | | | | Upstream/merge | |||||
| | | * \ \ | Merge branch 'master' into fix-core-dump-shared | Gennadiy Civil | 2018-01-09 | 70 | -772/+860 | |
| | | |\ \ \ | ||||||
| | | * \ \ \ | Merge branch 'master' into fix-core-dump-shared | Gennadiy Civil | 2017-12-08 | 5 | -2/+12 | |
| | | |\ \ \ \ | ||||||
| | | * | | | | | Fix double free when building Gtest/GMock in shared libraries and linking a ↵ | Romain Geissler | 2017-12-02 | 1 | -23/+40 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test executable with both. | |||||
| | | | | | * | | Code merging | Gennadiy Civil | 2018-01-15 | 2 | -8/+16 | |
| | | |_|_|/ / | |/| | | | | ||||||
| | * | | | | | continue upstream/merge, etc | Gennadiy Civil | 2018-01-11 | 1 | -4/+4 | |
| | | | | | | | ||||||
| | * | | | | | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-01-11 | 1 | -2/+2 | |
| | |\ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| | * | | | | | Trying to fix travis | Gennadiy Civil | 2018-01-11 | 1 | -4/+0 | |
| | | | | | | | ||||||
| | | | | | * | Merge branch 'support_xboxone' of ↵ | Gaspard Petit | 2018-01-12 | 0 | -0/+0 | |
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | https://github.com/eidosmontreal/googletest into support_xboxone | |||||
| | | | | | | * | Merge branch 'support_xboxone' of ↵ | Gaspard Petit | 2018-01-12 | 0 | -0/+0 | |
| | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/eidosmontreal/googletest into support_xboxone | |||||
| | | | | | | | * | Merge branch 'master' into support_xboxone | Gaspard Petit | 2018-01-09 | 93 | -986/+1211 | |
| | | | | | | | |\ | ||||||
