summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* more mergingrefs/pull/1415/headGennadiy 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
|\
| * Merge branch 'master' into support_xboxonerefs/pull/1401/headGennadiy Civil2018-01-1810-128/+415
| |\ | |/ |/|
* | Merge pull request #1412 from gennadiycivil/masterGennadiy Civil2018-01-181-1/+243
|\ \
| * | Adding python tests to Bazel build file. refs/pull/1412/headGennadiy Civil2018-01-181-1/+243
|/ /
* | Merge pull request #1407 from ted-xp/masterGennadiy Civil2018-01-187-77/+103
|\ \
| * | Use fully qualified in examplesrefs/pull/1407/headFedor 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
|\ \
| * | Reverting some changes, need to make the merge compilerefs/pull/1402/headGennadiy 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
|\ \ \
| * \ \ Merge branch 'master' into fix-core-dump-sharedrefs/pull/1339/headGennadiy Civil2018-01-1322-154/+180
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #1400 from gennadiycivil/masterGennadiy Civil2018-01-131-4/+4
|\ \ \ \
| | * \ \ 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 t...Romain Geissler2017-12-021-23/+40
| | | | | * | Code mergingGennadiy Civil2018-01-152-8/+16
| | |_|_|/ / | |/| | | |
| * | | | | continue upstream/merge, etcrefs/pull/1400/headGennadiy 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 https://github.com/eidosmontreal/googletest...Gaspard Petit2018-01-120-0/+0
| | | | | |\
| | | | | | * Merge branch 'support_xboxone' of https://github.com/eidosmontreal/googletest...Gaspard Petit2018-01-120-0/+0
| | | | | | |\
| | | | | | | * Merge branch 'master' into support_xboxoneGaspard Petit2018-01-0993-986/+1211
| | | | | | | |\
| | | | | | | * \ Merge branch 'master' into support_xboxonerefs/pull/1200/headGennadiy Civil2017-09-0639-104/+498
| | | | | | | |\ \
| | | | | | | * \ \ Merge branch 'master' into support_xboxoneGennadiy Civil2017-08-2542-1261/+2028
| | | | | | | |\ \ \
| | | | | | | * \ \ \ Merge branch 'master' into support_xboxoneGennadiy Civil2017-08-171-2/+1
| | | | | | | |\ \ \ \
| | | | | | | * \ \ \ \ Merge branch 'master' into support_xboxoneGennadiy Civil2017-08-1711-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
| |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | |
| | | | | * | | | | | | | Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOnegpetit2018-01-122-1/+4
| |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Update .travis.ymlGennadiy Civil2018-01-111-2/+0
* | | | | | | | | | | | Update .travis.ymlGennadiy Civil2018-01-111-2/+2
* | | | | | | | | | | | Update .travis.ymlGennadiy Civil2018-01-111-0/+2
* | | | | | | | | | | | Update .travis.ymlGennadiy Civil2018-01-111-4/+0
* | | | | | | | | | | | Merge pull request #1399 from gennadiycivil/masterGennadiy Civil2018-01-113-7/+33
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
generated by cgit v0.12 at 2024-09-14 07:23:16 (GMT)