aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Formatting change for auto code management, no functionality changesGennadiy Civil2018-08-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/google/googletest
| | | | | * Merge branch 'master' into deprecateLoo Rong Jie2018-08-0918-72/+117
| | | | | |\ | |_|_|_|_|/ |/| | | | |
* | | | | | Merge pull request #1714 from gennadiycivil/masterGennadiy Civil2018-08-0810-26/+24
|\ \ \ \ \ \ | | |/ / / / | |/| | / / | |_|_|/ / |/| | | | Formatting tweaks, no functionality changes
| * | | | Merge branch 'master' into masterGennadiy Civil2018-08-080-0/+0
| |\ \ \ \ | |/ / / / |/| / / / | |/ / /
* | | | Merge pull request #1713 from gennadiycivil/masterGennadiy Civil2018-08-081-0/+2
|\ \ \ \ | | | | | | | | | | code management changes, no functionalty changes
| | * | | Formatting tweaks, no functionality changesGennadiy Civil2018-08-0810-26/+24
| |/ / /
| * / / code management changes, no functionalty changesGennadiy Civil2018-08-081-0/+2
|/ / /
* | | Merge pull request #1710 from gennadiycivil/masterGennadiy Civil2018-08-082-0/+4
|\ \ \ | | | | | | | | Formatting Changes and small code merge
| * \ \ Merge branch 'master' of github.com:gennadiycivil/googletestGennadiy Civil2018-08-080-0/+0
| |\ \ \
| | * \ \ Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-08-080-0/+0
| | |\ \ \ | |_|/ / / |/| | | |
| * | | | Formatting Changes and small code mergeGennadiy Civil2018-08-080-0/+0
| |\ \ \ \ | |/ / / / |/| / / / | |/ / /
* | | | Merge pull request #1708 from drwez/fixFuchsiaGennadiy Civil2018-08-081-1/+1
|\ \ \ \ | | | | | | | | | | Fix typo breaking Fuchsia build.
| * | | | Fix typo breaking Fuchsia buildWez2018-08-071-1/+1
|/ / / /
* | | | Merge pull request #1707 from gennadiycivil/masterGennadiy Civil2018-08-071-0/+15
|\ \ \ \ | | | | | | | | | | upsream additional printer test
| * \ \ \ Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-08-070-0/+0
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #1705 from gennadiycivil/masterGennadiy Civil2018-08-077-29/+20
|\ \ \ \ \ | | | | | | | | | | | | Formatting changes,small cleanup, no functionality changes
| | | * | | Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-08-082-1/+5
| | |/ / / | | | | | | | | | | | | | | | | | | | | Formatting changes and code sync Merge branch 'master' of https://github.com/google/googletest
| | * / / upsream additional printer testGennadiy Civil2018-08-071-0/+15
| |/ / /
| * / / Formatting changes,small cleanup, no functionality changesGennadiy Civil2018-08-077-29/+20
|/ / /
* | | Merge pull request #1699 from drwez/suppressDefaultGennadiy Civil2018-08-071-15/+50
|\ \ \ | | | | | | | | Suppress default exception handling
| * \ \ Merge branch 'master' into suppressDefaultGennadiy Civil2018-08-071-2/+0
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #1704 from gennadiycivil/masterGennadiy Civil2018-08-071-2/+0
|\ \ \ \ | | | | | | | | | | small cleanup, np functional changes
| * | | | small cleanup, np functional changesGennadiy Civil2018-08-071-2/+0
|/ / / /
| * | | Merge branch 'master' into suppressDefaultGennadiy Civil2018-08-062-2/+4
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #1700 from gennadiycivil/masterGennadiy Civil2018-08-061-0/+2
|\ \ \ \ | | | | | | | | | | automatic code sync mgt, comment only
| * | | | automatic code sync mgt, comment onlyGennadiy Civil2018-08-061-0/+2
|/ / / /
* | | | Merge pull request #1673 from ppaulweber/bug/gcc_8_1_1_build_errorGennadiy Civil2018-08-061-2/+2
|\ \ \ \ | | | | | | | | | | Printers test: fixed compilation bug, due to unnecessary parentheses in declaration
| * | | | Printers test: fixed compilation bug, due to unnecessary parentheses in ↵Philipp Paulweber2018-08-031-2/+2
|/ / / / | | | | | | | | | | | | declaration
| * / / No default exception handlingWez2018-08-031-15/+50
|/ / /
| | * Merge branch 'master' into deprecateGennadiy Civil2018-08-0368-358/+872
| | |\ | |_|/ |/| |
* | | Merge pull request #1696 from gennadiycivil/masterGennadiy Civil2018-08-0247-314/+733
|\ \ \ | | | | | | | | Code transforms changes, renames.
| * | | one more fixGennadiy Civil2018-08-021-1/+1
| | | |
| * | | cmake fixesGennadiy Civil2018-08-022-3/+3
| | | |
| * | | more fixesGennadiy Civil2018-08-022-3/+3
| | | |
| * | | add --no_stacktrace_support for json-output-unittestGennadiy Civil2018-08-021-1/+1
| | | |
| * | | fixes testsGennadiy Civil2018-08-022-3/+3
| | | |
| * | | cmake test fixesGennadiy Civil2018-08-026-28/+28
| | | |
| * | | cmake fixesGennadiy Civil2018-08-022-5/+5
| | | |
| * | | cmake tests changesGennadiy Civil2018-08-021-12/+12
| | | |
| * | | cleaning up and adding test changes to CMakeGennadiy Civil2018-08-026-24/+24
| | | |
| * | | 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
|\ \ \ \ | | | | | | | | | | Formatting changes and upstreaming one test
| * \ \ \ Merge branch 'master' into masterGennadiy Civil2018-08-0119-41/+41
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #1685 from einsteinsfool/masterGennadiy Civil2018-08-0119-41/+41
|\ \ \ \ \ | | | | | | | | | | | | Updated broken and outdated URLs
| * \ \ \ \ Merge branch 'master' into masterGennadiy 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
| | | | | |