aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge branch 'master' into masterGennadiy Civil2018-04-041-1/+1
| |\ \ | |/ / |/| |
* | | Merge pull request #1543 from fo40225/fix_locale_winGennadiy Civil2018-04-041-1/+1
|\ \ \ | | | | | | | | fix build break on locale windows
| * \ \ Merge branch 'master' into fix_locale_winGennadiy Civil2018-04-041-1/+3
| |\ \ \ | |/ / / |/| | |
| * | | fix build break on locale windowsfo402252018-04-041-1/+1
| | | |
| | | * Merging matchers testGennadiy Civil2018-04-051-40/+779
| | |/
| | * bad cut/pasteGennadiy Civil2018-04-041-1/+1
| | |
| | * More on MSVC warning C4503, decorated name length exceededGennadiy Civil2018-04-041-2/+6
| | |
| | * More on MSVC warning C4503, decorated name length exceededGennadiy Civil2018-04-041-1/+1
| | |
| | * Address MSVC warning C4503, decorated name length exceeded, name was truncatedGennadiy Civil2018-04-041-0/+2
| | |
| | * Fixing build break on MSVCGennadiy Civil2018-04-041-1/+1
| | |
| | * Merge branch 'master' of github.com:google/googletestGennadiy Civil2018-04-040-0/+0
| | |\ | |_|/ |/| |
* | | Merge pull request #1542 from gennadiycivil/masterGennadiy Civil2018-04-041-1/+3
|\ \ \ | |/ / |/| | Tweaking #1523 to exclude nacl, cl 191591810
| | * merging gmock matchers 1Gennadiy Civil2018-04-043-72/+483
| |/
| * Tweaking https://github.com/google/googletest/pull/1523 to exclude naclGennadiy Civil2018-04-041-1/+3
|/
* Merge pull request #1523 from leissa/int3Gennadiy Civil2018-04-041-0/+3
|\ | | | | provide alternative for DebugBreak()
| * Merge branch 'master' into int3Gennadiy Civil2018-04-031-1/+1
| |\ | |/ |/|
* | Merge pull request #1541 from gennadiycivil/masterGennadiy Civil2018-04-031-1/+1
|\ \ | | | | | | Upstream, 191344765
| * \ Merge branch 'master' of github.com:google/googletestGennadiy Civil2018-04-030-0/+0
| |\ \ | |/ / |/| |
| * | Upstreaming, cl 191344765Gennadiy Civil2018-04-031-1/+1
| | |
| | * Merge branch 'master' into int3Gennadiy Civil2018-04-031-19/+5
| | |\ | |_|/ |/| |
* | | Merge pull request #1539 from gennadiycivil/masterGennadiy Civil2018-04-031-19/+5
|\| | | | | | | | merging port, continue
| * | merging port, cont. 191443078Gennadiy Civil2018-04-031-3/+5
| | |
| * | Merge branch 'master' of github.com:google/googletestGennadiy Civil2018-04-030-0/+0
| |\ \ | |/ / |/| |
| * | merging, cont - 2Gennadiy Civil2018-04-031-16/+0
| | |
| | * Merge branch 'master' into int3Gennadiy Civil2018-04-031-10/+22
| | |\ | |_|/ |/| |
* | | Merge pull request #1538 from gennadiycivil/masterGennadiy Civil2018-04-031-4/+7
|\| | | | | | | | merging , cont
| * | Merge branch 'master' of github.com:google/googletestGennadiy Civil2018-04-030-0/+0
| |\ \ | |/ / |/| |
* | | Merge pull request #1537 from gennadiycivil/masterGennadiy Civil2018-04-031-1/+6
|\ \ \ | | | | | | | | gtest-port.h merge
| | * | merging gtest-port.h , 191439094Gennadiy Civil2018-04-031-4/+7
| |/ /
| * | merging, just comments formatGennadiy Civil2018-04-031-1/+3
| | |
| * | testing, mergeGennadiy Civil2018-04-031-1/+1
| | |
| * | Merge branch 'master' of github.com:google/googletestGennadiy Civil2018-04-030-0/+0
| |\ \ | |/ / |/| |
* | | Merge pull request #1534 from gennadiycivil/masterGennadiy Civil2018-04-021-5/+9
|\ \ \ | | | | | | | | merging gtest-port.h, again - 1
| | * | Testing, gtest-port.h mergeGennadiy Civil2018-04-031-0/+3
| |/ /
| * / merging gtest-port.h, again - 1Gennadiy Civil2018-04-021-5/+9
|/ /
| * Merge branch 'master' into int3Roland Leißa2018-03-302-25/+46
| |\ | |/ |/|
* | Include OSX builds back into PR buildsGennadiy Civil2018-03-291-2/+0
| | | | | | Had an instance where the breakage was not detected until the actual merge. Need to be better than that
* | Merge pull request #1527 from google/revert-1518-masterGennadiy Civil2018-03-291-14/+9
|\ \ | | | | | | Revert "merging gtest-port 1 of N"
| * | Revert "merging gtest-port 1 of N"Gennadiy Civil2018-03-291-14/+9
|/ /
* | Merge pull request #1526 from google/revert-1525-masterGennadiy Civil2018-03-291-9/+37
|\ \ | | | | | | Revert "merging gtest-port, 2"
| * | Revert "merging gtest-port, 2"Gennadiy Civil2018-03-291-9/+37
|/ /
| * Merge remote-tracking branch 'google/master' into int3Roland Leißa2018-03-291-37/+9
| |\ | |/ |/|
* | Merge pull request #1525 from gennadiycivil/masterGennadiy Civil2018-03-291-37/+9
|\ \ | | | | | | merging gtest-port, 2
| * | merging gtest-port, 2Gennadiy Civil2018-03-291-37/+9
|/ /
| * typoRoland Leißa2018-03-291-1/+1
| |
| * provide alternative for DebugBreak()Roland Leißa2018-03-281-0/+3
|/ | | | This uses asm("int3") for clang/gcc on x86 as alternative for DebugBreak()
* Merge pull request #1518 from gennadiycivil/masterGennadiy Civil2018-03-271-9/+14
|\ | | | | merging gtest-port 1 of N
| * merging gtest-port 1 of NGennadiy Civil2018-03-271-9/+14
|/
* Merge pull request #1515 from gennadiycivil/masterGennadiy Civil2018-03-264-12/+17
|\ | | | | merges
| * merges 1Gennadiy Civil2018-03-261-3/+2
| |