summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into fix-msvc-d9025-warningrefs/pull/1612/headGennadiy Civil2018-08-17203-3123/+3652
|\
| * Merge pull request #1546 from henryiii/cleanup-cmakeGennadiy Civil2018-08-172-8/+33
| |\
| | * Merge branch 'master' into cleanup-cmakerefs/pull/1546/headHenry Schreiner2018-08-173-7/+49
| | |\ | | |/ | |/|
| * | Merge pull request #1646 from tisi1988/masterGennadiy Civil2018-08-161-2/+2
| |\ \
| | * | was not quite right, refs/pull/1646/headGennadiy Civil2018-08-160-0/+0
| | * | Small formatting changeGennadiy Civil2018-08-161-2/+2
| | * | Merge branch 'master' into masterGennadiy Civil2018-08-163-5/+58
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #1142 from scottslacksmith/masterGennadiy Civil2018-08-161-2/+44
| |\ \ \
| | * | | Small style changes. refs/pull/1142/headGennadiy Civil2018-08-161-14/+8
| | * | | Merge branch 'master' into masterGennadiy Civil2018-08-16245-8293/+15406
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #1746 from google/B60C9E9743233AA81897617B277709DFGennadiy Civil2018-08-151-3/+3
| |\ \ \ \
| | * | | | googletest exportrefs/pull/1746/headAbseil Team2018-08-151-3/+3
| |/ / / /
| | * | | Merge branch 'master' of https://github.com/google/googletestScott Slack-Smith2017-11-24167-28439/+3702
| | |\ \ \
| | * | | | *Silence false positive memory leaks reported by Microsoft's debug CRT*Scott Slack-Smith2017-06-301-2/+50
| | | | * | Merge branch 'master' into masterGennadiy Civil2018-08-15174-479/+293
| | | | |\ \
| | | | * \ \ Merge branch 'master' into mastertisi19882018-08-1412-78/+71
| | | | |\ \ \
| | | | * \ \ \ Merge branch 'master' into mastertisi19882018-08-0919-72/+115
| | | | |\ \ \ \
| | | | * \ \ \ \ Merge branch 'master' into mastertisi19882018-08-0769-360/+876
| | | | |\ \ \ \ \
| | | | * \ \ \ \ \ Merge branch 'master' into mastertisi19882018-08-0152-26/+107
| | | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge branch 'master' into mastertisi19882018-07-2325-2213/+2217
| | | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge branch 'master' into mastertisi19882018-07-123-320/+363
| | | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | | FIX: Compilation warning with GCC regarding a non-initialised member from Mut...tisi19882018-06-271-1/+1
| | | | | | | | | | | | * Merge branch 'master' into cleanup-cmakeGennadiy Civil2018-08-15218-6644/+8795
| | | | | | | | | | | | |\ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #1697 from morris-stock/ignore-cmake-generated-filesGennadiy Civil2018-08-151-0/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'master' into ignore-cmake-generated-filesrefs/pull/1697/headGennadiy Civil2018-08-15178-628/+480
| | |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #1734 from eliasdaler/cmake-binary-dir-fixGennadiy Civil2018-08-152-6/+6
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into cmake-binary-dir-fixrefs/pull/1734/headGennadiy Civil2018-08-1449-103/+64
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #1741 from gennadiycivil/masterGennadiy Civil2018-08-1449-103/+64
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | more comments changesrefs/pull/1741/headGennadiy Civil2018-08-143-5/+3
| | * | | | | | | | | | | | | more comments changesGennadiy Civil2018-08-144-4/+4
| | * | | | | | | | | | | | | Comments changes, no functionality changes. Gennadiy Civil2018-08-1447-98/+61
| |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | Merge branch 'master' into cmake-binary-dir-fixGennadiy Civil2018-08-14152-371/+224
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #1740 from gennadiycivil/masterGennadiy Civil2018-08-14144-289/+115
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Comments changes, no functionality changesrefs/pull/1740/headGennadiy Civil2018-08-14144-289/+115
| |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge pull request #1665 from rongjiecomputer/deprecateGennadiy Civil2018-08-144-8/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into deprecaterefs/pull/1665/headGennadiy Civil2018-08-1421-151/+155
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge pull request #1738 from gennadiycivil/masterGennadiy Civil2018-08-144-15/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Code formatting changes, clean up, no functionality changesrefs/pull/1738/headGennadiy Civil2018-08-144-15/+6
| |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge pull request #1733 from gennadiycivil/masterGennadiy Civil2018-08-147-58/+78
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch 'master' into masterrefs/pull/1733/headGennadiy Civil2018-08-141-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge pull request #924 from wind-river-cdt/cross-testing-patch-1Gennadiy Civil2018-08-131-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into cross-testing-patch-1refs/pull/924/headGennadiy Civil2018-08-1321-103/+94
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge branch 'master' into cross-testing-patch-1Gennadiy Civil2018-08-08311-36369/+19148
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Fix #923 - support CMAKE_CROSSCOMPILING_EMULATOR for testsMartin Oberhuber2016-11-051-1/+1
| | | | * | | | | | | | | | | | | formatting custom/README.mdGennadiy Civil2018-08-142-11/+11
| | | | * | | | | | | | | | | | | formatting for new READMEsGennadiy Civil2018-08-132-28/+28
| | | | * | | | | | | | | | | | | Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-08-130-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | Move instructions into custom/README filesGennadiy Civil2018-08-137-58/+78
| | | | | * | | | | | | | | | | | Merge branch 'master' into deprecateLoo Rong Jie2018-08-0918-72/+117
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |_|_|_|_|_|_|_|_|/ / | | | | | | |/| | | | | | | | | |
| | | | | * | | | | | | | | | | | Merge branch 'master' into deprecateGennadiy Civil2018-08-0368-358/+872
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \