aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1417 from gennadiycivil/masterGennadiy Civil2018-01-238-40/+71
|\ | | | | merges, cl/155419551 and others
| * Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-01-230-0/+0
| |\ | |/ |/|
* | Merge pull request #1415 from gennadiycivil/masterGennadiy Civil2018-01-227-43/+42
|\ \ | | | | | | code merge
| | * Merging, upstream http://cl/182836545Gennadiy Civil2018-01-235-10/+8
| | |
| | * more code mergeGennadiy Civil2018-01-221-3/+1
| | |
| | * merges, cl/155419551 and otherGennadiy Civil2018-01-224-27/+62
| |/
| * more mergingGennadiy Civil2018-01-222-6/+4
| |
| * mergingGennadiy Civil2018-01-221-2/+2
| |
| * code mergeGennadiy Civil2018-01-228-43/+44
|/
* Merge pull request #1401 from eidosmontreal/support_xboxoneGennadiy Civil2018-01-192-1/+4
|\ | | | | Added support for WINAPI_PARTITION_TV_TITLE to support XboxOne applications
| * Merge branch 'master' into support_xboxoneGennadiy Civil2018-01-1810-128/+415
| |\ | |/ |/|
* | Merge pull request #1412 from gennadiycivil/masterGennadiy Civil2018-01-181-1/+243
|\ \ | | | | | | Adding python tests to Bazel build file.
| * | Adding python tests to Bazel build file. Gennadiy Civil2018-01-181-1/+243
|/ /
* | Merge pull request #1407 from ted-xp/masterGennadiy Civil2018-01-187-77/+103
|\ \ | | | | | | Expose ScopedTrace utility in public interface
| * | Use fully qualified in examplesFedor Trushkin2018-01-181-2/+2
| | |
| * | Document ScopedTrace utilityFedor Trushkin2018-01-181-7/+9
| | |
| * | Expose ScopedTrace utility in public interfaceFedor Trushkin2018-01-176-70/+94
|/ /
* | Merge pull request #1402 from gennadiycivil/masterGennadiy Civil2018-01-152-23/+25
|\ \ | | | | | | Code merging
| * | Reverting some changes, need to make the merge compileGennadiy Civil2018-01-151-1/+1
| | |
| * | Reverting some changes, need to make the merge compileGennadiy Civil2018-01-151-2/+3
| | |
| * | Reverting some changes, need to make the merge compileGennadiy Civil2018-01-151-1/+0
| | |
| * | Reverting some changes, need to make the merge compileGennadiy Civil2018-01-152-53/+12
| | |
| * | Test files for corresponding changesGennadiy Civil2018-01-151-0/+2
| | |
| * | Test files for corresponding changesGennadiy Civil2018-01-151-6/+9
| | |
| * | Test files for corresponding changesGennadiy Civil2018-01-151-5/+25
| | |
| * | Test files for corresponding changesGennadiy Civil2018-01-151-0/+13
| | |
| * | Merge branch 'master' of github.com:gennadiycivil/googletestGennadiy Civil2018-01-150-0/+0
| |\ \
| | * \ Merge branch 'master' into masterGennadiy Civil2018-01-151-23/+40
| | |\ \ | |_|/ / |/| | |
| * | | More code mergesGennadiy Civil2018-01-151-18/+15
| | | |
| * | | Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-01-151-23/+40
| |\ \ \ | |/ / / |/| / / | |/ /
* | | Merge pull request #1339 from Romain-Geissler/fix-core-dump-sharedGennadiy Civil2018-01-151-23/+40
|\ \ \ | | | | | | | | Fix double free when building Gtest/GMock in shared libraries and lin…
| * \ \ Merge branch 'master' into fix-core-dump-sharedGennadiy Civil2018-01-1322-154/+180
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #1400 from gennadiycivil/masterGennadiy Civil2018-01-121-4/+4
|\ \ \ \ | | | | | | | | | | Upstream/merge
| | * \ \ Merge branch 'master' into fix-core-dump-sharedGennadiy Civil2018-01-0970-772/+860
| | |\ \ \
| | * \ \ \ Merge branch 'master' into fix-core-dump-sharedGennadiy Civil2017-12-085-2/+12
| | |\ \ \ \
| | * | | | | Fix double free when building Gtest/GMock in shared libraries and linking a ↵Romain Geissler2017-12-021-23/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | test executable with both.
| | | | | * | Code mergingGennadiy Civil2018-01-152-8/+16
| | |_|_|/ / | |/| | | |
| * | | | | continue upstream/merge, etcGennadiy Civil2018-01-111-4/+4
| | | | | |
| * | | | | Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-01-111-2/+2
| |\ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Trying to fix travisGennadiy Civil2018-01-111-4/+0
| | | | | |
| | | | | * Merge branch 'support_xboxone' of ↵Gaspard Petit2018-01-120-0/+0
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | https://github.com/eidosmontreal/googletest into support_xboxone
| | | | | | * Merge branch 'support_xboxone' of ↵Gaspard Petit2018-01-120-0/+0
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/eidosmontreal/googletest into support_xboxone
| | | | | | | * Merge branch 'master' into support_xboxoneGaspard Petit2018-01-0993-986/+1211
| | | | | | | |\
| | | | | | | * \ Merge branch 'master' into support_xboxoneGennadiy Civil2017-09-0639-104/+498
| | | | | | | |\ \
| | | | | | | * \ \ Merge branch 'master' into support_xboxoneGennadiy Civil2017-08-2442-1261/+2028
| | | | | | | |\ \ \
| | | | | | | * \ \ \ Merge branch 'master' into support_xboxoneGennadiy Civil2017-08-171-2/+1
| | | | | | | |\ \ \ \
| | | | | | | * \ \ \ \ Merge branch 'master' into support_xboxoneGennadiy Civil2017-08-1611-6/+233
| | | | | | | |\ \ \ \ \
| | | | | | | * \ \ \ \ \ Merge remote-tracking branch 'origin/master' into support_xboxonegpetit2017-08-14111-27398/+1254
| | | | | | | |\ \ \ \ \ \
| | | | | | | * | | | | | | Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOnegpetit2017-08-142-1/+4
| | | | | | | | | | | | | |
| | | | | | * | | | | | | | Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOnegpetit2018-01-122-1/+4
| |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-17 02:34:13 +0000