aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | Code mergesGennadiy Civil2018-01-302-22/+64
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #1434 from gennadiycivil/masterGennadiy Civil2018-01-304-0/+67
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ability to optionally depend on Abseil plus upstream of 183716547
| * | | | | | | | | | | | | | | | | | Ability to optionally depend on Abseil plus upstream of 183716547Gennadiy Civil2018-01-304-0/+67
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #1430 from gennadiycivil/masterGennadiy Civil2018-01-292-6/+72
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding tests to googlemock bazel
| * | | | | | | | | | | | | | | | | | Adding tests to googlemock bazelGennadiy Civil2018-01-262-6/+72
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #1429 from gennadiycivil/masterGennadiy Civil2018-01-269-34/+86
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code merges
| * | | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-01-262-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #1428 from lidaobing/patch-2Gennadiy Civil2018-01-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Documentation.md
| * | | | | | | | | | | | | | | | | | | Update Documentation.mdLI Daobing2018-01-261-1/+1
| | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #1426 from stefanosoffia/fix_test_build_gcc7_2_0Gennadiy Civil2018-01-261-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | Fix test build issue with GCC7.2 (with -Wno-error=)
| * | | | | | | | | | | | | | | | | | Fix test build issue with GCC7.2.Stefano Soffia2018-01-251-0/+3
|/ / / / / / / / / / / / / / / / / /
| * / / / / / / / / / / / / / / / / Code mergesGennadiy Civil2018-01-269-34/+86
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Update README.mdGennadiy Civil2018-01-251-1/+1
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Remove Visual Studio 10,11,12 from build matrixGennadiy Civil2018-01-251-15/+0
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #1421 from gennadiycivil/masterGennadiy Civil2018-01-246-4/+181
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | upstream cl 182543808
| * | | | | | | | | | | | | | | | | placating gcc and its overzeauls size comparison warningsGennadiy Civil2018-01-241-1/+1
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-01-240-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #1418 from gennadiycivil/masterGennadiy Civil2018-01-2415-32/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many code merge/upstream changes
| | * | | | | | | | | | | | | | | | | upstream cl 182543808Gennadiy Civil2018-01-246-4/+181
| | |/ / / / / / / / / / / / / / / /
| | * / / / / / / / / / / / / / / / Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-01-241-1/+1
| |/| | | | | | | | | | | | | | | | | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #1410 from pcc/win-libcxxGennadiy Civil2018-01-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check whether _MSC_VER is defined when detecting presence of cxxabi.h…
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into win-libcxxGennadiy Civil2018-01-2315-84/+117
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #1417 from gennadiycivil/masterGennadiy Civil2018-01-238-40/+71
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merges, cl/155419551 and others
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into win-libcxxGennadiy Civil2018-01-188-78/+346
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | Check whether _MSC_VER is defined when detecting presence of cxxabi.h under ↵Peter Collingbourne2018-01-171-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 compiledGennadiy Civil2018-01-241-46/+3
| | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | Many code merge/upstream changesGennadiy Civil2018-01-2316-35/+93
| | |_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | |