summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-08-0119-41/+41
|\
| * Merge pull request #1695 from gennadiycivil/masterGennadiy Civil2018-08-014-3/+98
| |\
| | * Merge branch 'master' into masterrefs/pull/1695/headGennadiy Civil2018-08-0119-41/+41
| | |\ | | |/ | |/|
| * | Merge pull request #1685 from einsteinsfool/masterGennadiy Civil2018-08-0119-41/+41
| |\ \
| | * \ Merge branch 'master' into masterrefs/pull/1685/headGennadiy Civil2018-07-3048-2/+91
| | |\ \ | | |/ / | |/| |
| | * | Updated broken and outdated URLsPiotr Kąkol2018-07-2519-41/+41
* | | | Corresponding CMake ChangesGennadiy Civil2018-08-011-12/+12
* | | | various changes to testsGennadiy Civil2018-08-0114-797/+334
* | | | more test changesGennadiy Civil2018-08-016-8/+8
* | | | adding googletest-json-output unitestGennadiy Civil2018-08-012-0/+639
* | | | more test changesGennadiy Civil2018-08-015-311/+176
* | | | more tests changesGennadiy Civil2018-08-014-6/+69
* | | | googletest list tests unitestGennadiy Civil2018-08-013-12/+12
* | | | gtest catch exceptions test and gtest shuffle testGennadiy Civil2018-08-016-25/+332
* | | | changes to googletest break on failure and googletest filter unittestsGennadiy Civil2018-08-017-31/+38
* | | | changes for googletest env var testGennadiy Civil2018-08-013-9/+9
* | | | googltest-color-test changesGennadiy Civil2018-08-013-7/+7
* | | | googletest-output-test changesGennadiy Civil2018-08-014-118/+119
| |_|/ |/| |
* | | Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-08-010-0/+0
|\ \ \ | |/ /
| * | Merge pull request #1691 from gennadiycivil/masterGennadiy Civil2018-07-301-1/+1
| |\ \
* | | | Formatting changes and upstreaming one testGennadiy Civil2018-08-014-3/+98
| |/ / |/| |
* | | Merge branch 'master' of https://github.com/google/googletestrefs/pull/1691/headGennadiy Civil2018-07-300-0/+0
|\ \ \ | |/ /
| * | Merge pull request #1688 from gennadiycivil/masterGennadiy Civil2018-07-2747-1/+90
| |\ \ | | |/ | |/|
* | | small tweaks, OSS merge cl 206357486Gennadiy Civil2018-07-301-1/+1
| |/ |/|
* | added missing commentsrefs/pull/1688/headGennadiy Civil2018-07-272-2/+2
* | Formatting changes for automatic code managementGennadiy Civil2018-07-2747-1/+90
|/
* Merge pull request #1684 from gennadiycivil/masterGennadiy Civil2018-07-254-7/+5
|\
| * Formatting changes, code syncrefs/pull/1684/headGennadiy Civil2018-07-254-7/+5
|/
* Merge pull request #1606 from m-tmatma/feature/fix-build-error-vs2017-win10-jpGennadiy Civil2018-07-242-4/+4
|\
| * Merge branch 'master' into feature/fix-build-error-vs2017-win10-jprefs/pull/1606/headGennadiy Civil2018-07-231-13/+7
| |\ | |/ |/|
* | Merge pull request #1678 from stianval/masterGennadiy Civil2018-07-231-13/+7
|\ \
| * | Update primer.mdrefs/pull/1678/headStian Valle2018-07-211-12/+6
| * | Update primer.mdStian Valle2018-07-211-12/+12
| * | Update primer.mdStian Valle2018-07-211-7/+7
|/ /
| * Merge branch 'master' into feature/fix-build-error-vs2017-win10-jpMasaru Tsuchiyama2018-07-216-32/+67
| |\ | |/ |/|
* | Merge pull request #1676 from gennadiycivil/masterGennadiy Civil2018-07-203-5/+18
|\ \
| * | code mergerefs/pull/1676/headGennadiy Civil2018-07-203-5/+18
|/ /
* | Merge pull request #1668 from duxiuxing/googletest_for_asamGennadiy Civil2018-07-205-25/+25
|\ \
| * \ Merge branch 'master' into googletest_for_asamrefs/pull/1668/headduxiuxing2018-07-192-7/+29
| |\ \ | |/ / |/| |
* | | Merge pull request #1674 from gennadiycivil/masterGennadiy Civil2018-07-192-7/+29
|\ \ \
| * \ \ Merge branch 'master' into masterrefs/pull/1674/headGennadiy Civil2018-07-191-0/+3
| |\ \ \ | |/ / / |/| | |
| * | | code syncGennadiy Civil2018-07-192-4/+9
| * | | Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-07-180-0/+0
| |\ \ \
| * | | | Code syncGennadiy Civil2018-07-181-3/+20
| | | * | Replace "…" with "..."(three dots) to fix warning C4819 in Visual Studio杜修杏2018-07-192-4/+4
| | | * | Merge branch 'master' into googletest_for_asamduxiuxing2018-07-198-2122/+1725
| | | |\ \ | |_|_|/ / |/| | | |
| | | * | Fix warning C4819: The file contains a character that cannot be represented i...duxiuxing2018-07-173-21/+21
| | | | * Merge branch 'master' into feature/fix-build-error-vs2017-win10-jpMasaru Tsuchiyama2018-07-188-2122/+1725
| | | | |\ | |_|_|_|/ |/| | | |
* | | | | Merge pull request #1669 from syohex/ignore-ds-storeGennadiy Civil2018-07-181-0/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Merge branch 'master' into ignore-ds-storerefs/pull/1669/headGennadiy Civil2018-07-187-2122/+1722
| |\ \ \ \ | |/ / / / |/| | | |