aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1347 from Burgch/fix-argcGennadiy Civil2018-08-191-0/+17
|\
| * Merge branch 'master' into fix-argcGennadiy Civil2018-08-193-8/+14
| |\ | |/ |/|
* | Merge pull request #1612 from wkaluza/fix-msvc-d9025-warningGennadiy Civil2018-08-171-0/+5
|\ \
| * \ Merge branch 'master' into fix-msvc-d9025-warningGennadiy Civil2018-08-17203-3123/+3652
| |\ \
| * | | Remove default /EHsc compiler flagWojciech Kaluza2018-07-111-0/+5
* | | | Merge pull request #1652 from medithe/patch-1Gennadiy Civil2018-08-171-4/+5
|\ \ \ \
| * \ \ \ Merge branch 'master' into patch-1Gennadiy Civil2018-08-171-4/+4
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #1748 from laixer/stdGennadiy Civil2018-08-171-4/+4
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | std references shouldn't be fully qualifiedVadim Berezniker2018-08-171-4/+4
|/ / / /
| * | | FormattingGennadiy Civil2018-08-171-4/+5
| * | | Merge branch 'master' into patch-1Gennadiy Civil2018-08-176-15/+93
| |\ \ \ | |/ / / |/| | |
| * | | Merge branch 'master' into patch-1Gennadiy Civil2018-08-15204-3409/+3903
| |\ \ \
| * | | | Cast the tr1::tuple_element template parameter to intmedithe2018-07-091-2/+2
| | | | * Minor formatting/style changesGennadiy Civil2018-08-171-8/+7
| | | | * Merge branch 'master' into fix-argcConor Burgess2018-08-17222-7276/+13402
| | | | |\ | |_|_|_|/ |/| | | |
* | | | | Merge pull request #1546 from henryiii/cleanup-cmakeGennadiy Civil2018-08-172-8/+33
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into cleanup-cmakeHenry Schreiner2018-08-173-7/+49
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #1646 from tisi1988/masterGennadiy Civil2018-08-161-2/+2
|\ \ \ \ \ \
| * | | | | | was not quite right, Gennadiy 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. Gennadiy 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 exportAbseil 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-filesGennadiy 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-fixGennadiy Civil2018-08-1449-103/+64
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #1741 from gennadiycivil/masterGennadiy Civil2018-08-1449-103/+64
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | more comments changesGennadiy 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 changesGennadiy Civil2018-08-14144-289/+115
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #1665 from rongjiecomputer/deprecateGennadiy Civil2018-08-144-8/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into deprecateGennadiy Civil2018-08-1421-151/+155
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |