Gennadiy Civil
|
40904f8970
|
Merge pull request #1684 from gennadiycivil/master
Formatting changes, code sync
|
7 years ago |
Gennadiy Civil
|
ed1edf641d
|
Formatting changes, code sync
|
7 years ago |
|
Gennadiy Civil
|
78b49242d1
|
Merge pull request #1606 from m-tmatma/feature/fix-build-error-vs2017-win10-jp
#1595: fix compiler error with Visual Studio 2017 on Win10 JP.
|
7 years ago |
|
Gennadiy Civil
|
a68f0c201d
|
Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp
|
7 years ago |
|
Gennadiy Civil
|
82c858b3ad
|
Merge pull request #1678 from stianval/master
Fixing some formatting in docs/primer
|
7 years ago |
Stian Valle
|
bb9fc6f66e
|
Update primer.md
|
7 years ago |
|
Stian Valle
|
7abf99d941
|
Update primer.md
|
7 years ago |
|
Stian Valle
|
baf2115a59
|
Update primer.md
|
7 years ago |
Masaru Tsuchiyama
|
534570b5bd
|
Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp
|
7 years ago |
|
Gennadiy Civil
|
2a151c93c1
|
Merge pull request #1676 from gennadiycivil/master
code merge
|
7 years ago |
|
Gennadiy Civil
|
a02af2f689
|
code merge
|
7 years ago |
|
Gennadiy Civil
|
c62c79432b
|
Merge pull request #1668 from duxiuxing/googletest_for_asam
Fix warning C4819 in Visual Studio
|
7 years ago |
duxiuxing
|
d8db0ca9cf
|
Merge branch 'master' into googletest_for_asam
|
7 years ago |
杜修杏
|
2eb4396007
|
Replace "…" with "..."(three dots) to fix warning C4819 in Visual Studio
|
7 years ago |
|
Gennadiy Civil
|
6ce9b98f54
|
Merge pull request #1674 from gennadiycivil/master
Code Sync
|
7 years ago |
|
Gennadiy Civil
|
61b8197217
|
Merge branch 'master' into master
|
7 years ago |
|
Gennadiy Civil
|
0c17888bcf
|
code sync
|
7 years ago |
|
duxiuxing
|
5b19054b02
|
Merge branch 'master' into googletest_for_asam
|
7 years ago |
|
Masaru Tsuchiyama
|
40cd5d1170
|
Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp
|
7 years ago |
|
Gennadiy Civil
|
1370e7658b
|
Merge pull request #1669 from syohex/ignore-ds-store
Ignore .DS_Store file
|
7 years ago |
|
Gennadiy Civil
|
a3509a5aa4
|
Merge branch 'master' of https://github.com/google/googletest
|
7 years ago |
|
Gennadiy Civil
|
43163c19d5
|
Merge branch 'master' into ignore-ds-store
|
7 years ago |
|
Gennadiy Civil
|
4235fff7f4
|
Merge pull request #1671 from gennadiycivil/master
Code merge
|
7 years ago |
|
Gennadiy Civil
|
3530ab9e43
|
Code sync
|
7 years ago |
|
Gennadiy Civil
|
d41bfd732f
|
Fix link
|
7 years ago |
|
Gennadiy Civil
|
8d07cfd053
|
Code sync, mostly formatting and removing outdates
|
7 years ago |
|
Gennadiy Civil
|
7e73a7ae6e
|
Formatting and a link
|
7 years ago |
|
Gennadiy Civil
|
20ef7944a4
|
Merge pull request #1667 from hckr/patch-1
Fix broken links to FAQ in primer.md
|
7 years ago |
|
Gennadiy Civil
|
2211061e64
|
Merge pull request #1670 from gennadiycivil/master
Docs sync
|
7 years ago |
|
Masaru Tsuchiyama
|
234958def5
|
Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp
|
7 years ago |
|
Gennadiy Civil
|
4abbb774c3
|
Merge branch 'master' of https://github.com/google/googletest
|
7 years ago |
|
Gennadiy Civil
|
5437926b22
|
Docs sync
|
7 years ago |
Syohei YOSHIDA
|
a091b75332
|
Ignore .DS_Store file
|
7 years ago |
|
duxiuxing
|
65a49a73f0
|
Fix warning C4819: The file contains a character that cannot be represented in the current code page (936). Save the file in Unicode format to prevent data loss
|
7 years ago |
Jakub Młokosiewicz
|
021c308069
|
Fix broken links to FAQ in primer.md
|
7 years ago |
|
Gennadiy Civil
|
077ee54cef
|
Merge pull request #1655 from AdrianMoranMontes/master
Fix issue #1654.
|
7 years ago |
Adrian Moran
|
ee3885fbd6
|
Merge branch 'master' into master
|
7 years ago |
Adrian Moran
|
cbd07191f4
|
Put ifdef guard after the includes.
Signed-off-by: Adrian Moran <amoran@ikerlan.es>
|
7 years ago |
|
Gennadiy Civil
|
b4d4438df9
|
Merge pull request #1653 from derekmauro/stacktrace
Adds stacktrace support from Abseil to Google Test
|
7 years ago |
Derek Mauro
|
82670da613
|
Merge branch 'master' into stacktrace
|
7 years ago |
|
Gennadiy Civil
|
df0d0a3f33
|
Merge pull request #1662 from derekmauro/variant
Adds the UniversalPrinter for absl::variant.
|
7 years ago |
|
Derek Mauro
|
6c7878a151
|
Adds the UniversalPrinter for absl::variant.
|
7 years ago |
|
Adrian Moran
|
0acdf79642
|
Avoid full test in no exceptions are enabled.
Signed-off-by: Adrian Moran <amoran@ikerlan.es>
|
7 years ago |
|
Gennadiy Civil
|
a5190506e7
|
Merge branch 'master' into master
|
7 years ago |
|
Gennadiy Civil
|
41f0e24335
|
Merge pull request #1647 from duxiuxing/googletest_for_asam
VS2005 with SP1(_MSC_VER=1400) already supports __pragma
|
7 years ago |
|
Gennadiy Civil
|
d91b0de99e
|
Merge branch 'master' into googletest_for_asam
|
7 years ago |
|
Gennadiy Civil
|
7eae4ea4e1
|
Merge pull request #1656 from gennadiycivil/master
docs sync, formatting
|
7 years ago |
|
Gennadiy Civil
|
36066cfecf
|
more formatting [skip ci]
|
7 years ago |
|
Gennadiy Civil
|
74cccf494a
|
formatting, [ci skip]
|
7 years ago |
|
Adrian Moran
|
93bfdde0ee
|
Fix issue #1654.
Signed-off-by: Adrian Moran <amoran@ikerlan.es>
|
7 years ago |
