Gennadiy Civil
|
0452f1fbff
|
Fixing build break on MSVC
|
2018-04-04 14:48:06 -04:00 |
|
Gennadiy Civil
|
ca928f3990
|
Merge pull request #1543 from fo40225/fix_locale_win
fix build break on locale windows
|
2018-04-04 14:28:11 -04:00 |
|
Gennadiy Civil
|
2b3d17b2ba
|
Merge branch 'master' of github.com:google/googletest
|
2018-04-04 14:05:15 -04:00 |
|
Gennadiy Civil
|
bd0ae14317
|
merging gmock matchers 1
|
2018-04-04 14:05:00 -04:00 |
|
Gennadiy Civil
|
c02289588b
|
Merge branch 'master' into fix_locale_win
|
2018-04-04 13:58:55 -04:00 |
|
Gennadiy Civil
|
65c10f33d9
|
Merge pull request #1542 from gennadiycivil/master
Tweaking #1523 to exclude nacl, cl 191591810
|
2018-04-04 11:35:28 -04:00 |
|
fo40225
|
be6dfba167
|
fix build break on locale windows
|
2018-04-04 23:16:16 +08:00 |
|
Gennadiy Civil
|
a36f3d1e6a
|
Tweaking https://github.com/google/googletest/pull/1523 to exclude nacl
|
2018-04-04 11:06:09 -04:00 |
|
Gennadiy Civil
|
3b447cdd91
|
Merge pull request #1523 from leissa/int3
provide alternative for DebugBreak()
|
2018-04-04 10:51:46 -04:00 |
|
Gennadiy Civil
|
34e82f9eb5
|
Merge branch 'master' into int3
|
2018-04-03 16:31:59 -04:00 |
|
Gennadiy Civil
|
9fd5a03107
|
Merge pull request #1541 from gennadiycivil/master
Upstream, 191344765
|
2018-04-03 16:28:53 -04:00 |
|
Gennadiy Civil
|
bd6296d44c
|
Merge branch 'master' into int3
|
2018-04-03 16:27:32 -04:00 |
|
Gennadiy Civil
|
d3e1b8ff64
|
Merge branch 'master' of github.com:google/googletest
|
2018-04-03 16:15:16 -04:00 |
|
Gennadiy Civil
|
fdc03e450a
|
Upstreaming, cl 191344765
|
2018-04-03 16:14:35 -04:00 |
|
Gennadiy Civil
|
52a1decd3b
|
Merge pull request #1539 from gennadiycivil/master
merging port, continue
|
2018-04-03 15:26:44 -04:00 |
|
Gennadiy Civil
|
06f96276f6
|
Merge branch 'master' into int3
|
2018-04-03 11:44:23 -04:00 |
|
Gennadiy Civil
|
f7e1b4f330
|
merging port, cont. 191443078
|
2018-04-03 11:38:30 -04:00 |
|
Gennadiy Civil
|
4c2d2065b5
|
Merge branch 'master' of github.com:google/googletest
|
2018-04-03 11:24:45 -04:00 |
|
Gennadiy Civil
|
ffcd94d903
|
merging, cont - 2
|
2018-04-03 11:23:54 -04:00 |
|
Gennadiy Civil
|
bc16771801
|
Merge pull request #1538 from gennadiycivil/master
merging , cont
|
2018-04-03 11:18:56 -04:00 |
|
Gennadiy Civil
|
bc8445f91f
|
Merge branch 'master' of github.com:google/googletest
|
2018-04-03 11:06:34 -04:00 |
|
Gennadiy Civil
|
5539444c20
|
merging gtest-port.h , 191439094
|
2018-04-03 11:06:20 -04:00 |
|
Gennadiy Civil
|
d1ce051947
|
Merge pull request #1537 from gennadiycivil/master
gtest-port.h merge
|
2018-04-03 10:09:08 -04:00 |
|
Gennadiy Civil
|
4534287cb6
|
merging, just comments format
|
2018-04-03 09:56:23 -04:00 |
|
Gennadiy Civil
|
98f4d5db7a
|
testing, merge
|
2018-04-03 09:45:49 -04:00 |
|
Gennadiy Civil
|
543e387114
|
Merge branch 'master' of github.com:google/googletest
|
2018-04-03 09:31:49 -04:00 |
|
Gennadiy Civil
|
c300e3085b
|
Testing, gtest-port.h merge
|
2018-04-03 09:31:10 -04:00 |
|
Gennadiy Civil
|
857d402550
|
Merge pull request #1534 from gennadiycivil/master
merging gtest-port.h, again - 1
|
2018-04-02 16:03:22 -04:00 |
|
Gennadiy Civil
|
b4d1bd371d
|
merging gtest-port.h, again - 1
|
2018-04-02 14:22:24 -04:00 |
|
Tanzinul Islam
|
b81886229d
|
Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
|
2018-04-01 13:43:57 +01:00 |
|
Roland Leißa
|
8f7e029803
|
Merge branch 'master' into int3
|
2018-03-30 03:16:20 +02:00 |
|
Gennadiy Civil
|
a0dd1a237a
|
Include OSX builds back into PR builds
Had an instance where the breakage was not detected until the actual merge. Need to be better than that
|
2018-03-29 13:50:32 -04:00 |
|
Gennadiy Civil
|
5637af0d68
|
Merge pull request #1527 from google/revert-1518-master
Revert "merging gtest-port 1 of N"
|
2018-03-29 13:28:47 -04:00 |
|
Gennadiy Civil
|
73996ca508
|
Revert "merging gtest-port 1 of N"
|
2018-03-29 13:28:29 -04:00 |
|
Gennadiy Civil
|
034db5c75e
|
Merge pull request #1526 from google/revert-1525-master
Revert "merging gtest-port, 2"
|
2018-03-29 13:28:04 -04:00 |
|
Gennadiy Civil
|
148ec8fb4e
|
Revert "merging gtest-port, 2"
|
2018-03-29 13:27:11 -04:00 |
|
Roland Leißa
|
6eed4f687b
|
Merge remote-tracking branch 'google/master' into int3
|
2018-03-29 16:39:40 +02:00 |
|
Roland Leißa
|
4581b9eb35
|
typo
|
2018-03-29 16:38:23 +02:00 |
|
Gennadiy Civil
|
60fb62367a
|
Merge pull request #1525 from gennadiycivil/master
merging gtest-port, 2
|
2018-03-29 10:24:19 -04:00 |
|
Gennadiy Civil
|
be841c6ed1
|
merging gtest-port, 2
|
2018-03-29 09:46:13 -04:00 |
|
Roland Leißa
|
d0c03cc388
|
provide alternative for DebugBreak()
This uses asm("int3") for clang/gcc on x86 as alternative for DebugBreak()
|
2018-03-28 23:45:51 +02:00 |
|
Gennadiy Civil
|
08d852bf71
|
Merge pull request #1518 from gennadiycivil/master
merging gtest-port 1 of N
|
2018-03-27 15:39:32 -04:00 |
|
Gennadiy Civil
|
a81411ca4d
|
merging gtest-port 1 of N
|
2018-03-27 15:19:40 -04:00 |
|
Gennadiy Civil
|
2f3af4f923
|
Merge pull request #1515 from gennadiycivil/master
merges
|
2018-03-26 14:10:38 -04:00 |
|
Gennadiy Civil
|
09e4f71b65
|
merges 1
|
2018-03-26 13:14:00 -04:00 |
|
Gennadiy Civil
|
5da5653e76
|
Merge branch 'master' of https://github.com/google/googletest
|
2018-03-26 13:04:34 -04:00 |
|
Gennadiy Civil
|
b7e7102bb3
|
merges, gtest
|
2018-03-26 13:04:28 -04:00 |
|
Gennadiy Civil
|
2a46378fbb
|
Merge pull request #1512 from gennadiycivil/master
merges, gmock - 1
|
2018-03-26 11:19:10 -04:00 |
|
Gennadiy Civil
|
7c7ab001c1
|
merging gmock-matchers.h 3
|
2018-03-26 10:36:26 -04:00 |
|
Gennadiy Civil
|
0eff246cb1
|
merging gmock-matchers.h 2
|
2018-03-26 10:16:59 -04:00 |
|