aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into mastertisi19882018-08-0152-26/+107
|\
| * Merge pull request #1691 from gennadiycivil/masterGennadiy Civil2018-07-301-1/+1
| |\ | | | | | | small tweaks, OSS merge cl 206357486
| | * Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-07-300-0/+0
| | |\ | | |/ | |/|
| * | Merge pull request #1688 from gennadiycivil/masterGennadiy Civil2018-07-2747-1/+90
| |\ \ | | | | | | | | Formatting changes for automatic code management
| | | * small tweaks, OSS merge cl 206357486Gennadiy Civil2018-07-301-1/+1
| | |/
| | * added missing commentsGennadiy 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 sync
| | * Formatting changes, code syncGennadiy Civil2018-07-254-7/+5
| |/
| * Merge pull request #1606 from m-tmatma/feature/fix-build-error-vs2017-win10-jpGennadiy Civil2018-07-242-4/+4
| |\ | | | | | | #1595: fix compiler error with Visual Studio 2017 on Win10 JP.
| | * Merge branch 'master' into feature/fix-build-error-vs2017-win10-jpGennadiy Civil2018-07-231-13/+7
| | |\ | | |/ | |/|
| * | Merge pull request #1678 from stianval/masterGennadiy Civil2018-07-231-13/+7
| |\ \ | | | | | | | | Fixing some formatting in docs/primer
| | * | Update primer.mdStian 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 branch 'master' into feature/fix-build-error-vs2017-win10-jpMasaru Tsuchiyama2018-07-198-2122/+1725
| | |\
| | * \ Merge branch 'master' into feature/fix-build-error-vs2017-win10-jpMasaru Tsuchiyama2018-07-1814-376/+785
| | |\ \
| | * | | This closes #1595: fix compiler error with Visual Studio 2017 on Win10 JP.Masaru Tsuchiyama2018-06-302-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | non-ASCII charactors are interpreted as Shift-JIS on the environment. But the charators in the files are non Shift-JIS charactors and the compiler stops compiling with C4819. To fix the errors, remove non-ASCII charactors.
* | | | | Merge branch 'master' into mastertisi19882018-07-2325-2213/+2217
|\| | | |
| * | | | Merge pull request #1676 from gennadiycivil/masterGennadiy Civil2018-07-203-5/+18
| |\ \ \ \ | | | | | | | | | | | | code merge
| | * | | | code mergeGennadiy Civil2018-07-203-5/+18
| |/ / / /
| * | | | Merge pull request #1668 from duxiuxing/googletest_for_asamGennadiy Civil2018-07-205-25/+25
| |\ \ \ \ | | | | | | | | | | | | Fix warning C4819 in Visual Studio
| | * \ \ \ Merge branch 'master' into googletest_for_asamduxiuxing2018-07-202-7/+29
| | |\ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #1674 from gennadiycivil/masterGennadiy Civil2018-07-192-7/+29
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | Code Sync
| | * | | | Merge branch 'master' into masterGennadiy 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-202-4/+4
| | | | | | |
| | | | * | | Merge branch 'master' into googletest_for_asamduxiuxing2018-07-198-2122/+1725
| | | | |\ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge pull request #1669 from syohex/ignore-ds-storeGennadiy Civil2018-07-181-0/+3
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | Ignore .DS_Store file
| | * | | | | Merge branch 'master' into ignore-ds-storeGennadiy Civil2018-07-187-2122/+1722
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #1671 from gennadiycivil/masterGennadiy Civil2018-07-184-205/+4
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | Code merge
| | * | | | | Fix linkGennadiy Civil2018-07-181-1/+1
| | | | | | |
| | * | | | | Code sync, mostly formatting and removing outdatesGennadiy Civil2018-07-182-203/+2
| | | | | | |
| | * | | | | Formatting and a linkGennadiy Civil2018-07-183-3/+3
| |/ / / / /
| * | | | | Merge pull request #1667 from hckr/patch-1Gennadiy Civil2018-07-181-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | Fix broken links to FAQ in primer.md
| | * | | | | Fix broken links to FAQ in primer.mdJakub Młokosiewicz2018-07-171-2/+2
| | | |_|_|/ | | |/| | |
| * | | | | Merge pull request #1670 from gennadiycivil/masterGennadiy Civil2018-07-183-1915/+1716
| |\ \ \ \ \ | | |/ / / / | |/| | | | Docs sync
| | * | | | Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-07-1712-57/+423
| | |\ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Docs syncGennadiy Civil2018-07-173-1915/+1716
| | | | | |
| | | * | | Ignore .DS_Store fileSyohei YOSHIDA2018-07-171-0/+3
| | |/ / / | |/| | |
| | | * | Fix warning C4819: The file contains a character that cannot be represented ↵duxiuxing2018-07-173-21/+21
| | |/ / | |/| | | | | | | | | | in the current code page (936). Save the file in Unicode format to prevent data loss
| * | | Merge pull request #1655 from AdrianMoranMontes/masterGennadiy Civil2018-07-161-3/+2
| |\ \ \ | | | | | | | | | | Fix issue #1654.
| | * \ \ Merge branch 'master' into masterAdrian Moran2018-07-1310-53/+420
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #1653 from derekmauro/stacktraceGennadiy Civil2018-07-129-37/+379
| |\ \ \ \ | | | | | | | | | | | | Adds stacktrace support from Abseil to Google Test
| | * \ \ \ Merge branch 'master' into stacktraceDerek Mauro2018-07-125-320/+387
| | |\ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #1662 from derekmauro/variantGennadiy Civil2018-07-122-17/+42
| |\ \ \ \ \ | | | | | | | | | | | | | | Adds the UniversalPrinter for absl::variant.
| | * | | | | Adds the UniversalPrinter for absl::variant.Derek Mauro2018-07-122-17/+42
| |/ / / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-30 03:01:41 +0000