Gennadiy Civil
|
fbe3c94533
|
Merge branch 'master' into fix_locale_win
|
2018-04-04 13:58:55 -04:00 |
|
Gennadiy Civil
|
4377699066
|
Merge pull request #1542 from gennadiycivil/master
Tweaking #1523 to exclude nacl, cl 191591810
|
2018-04-04 11:35:28 -04:00 |
|
fo40225
|
a0c27bd8a5
|
fix build break on locale windows
|
2018-04-04 23:16:16 +08:00 |
|
Gennadiy Civil
|
1776ed8c1e
|
Tweaking https://github.com/google/googletest/pull/1523 to exclude nacl
|
2018-04-04 11:06:09 -04:00 |
|
Gennadiy Civil
|
07af8af373
|
Merge pull request #1523 from leissa/int3
provide alternative for DebugBreak()
|
2018-04-04 10:51:46 -04:00 |
|
Gennadiy Civil
|
98687b7847
|
Merge branch 'master' into int3
|
2018-04-03 16:31:59 -04:00 |
|
Gennadiy Civil
|
7d955430d1
|
Merge pull request #1541 from gennadiycivil/master
Upstream, 191344765
|
2018-04-03 16:28:53 -04:00 |
|
Gennadiy Civil
|
18be012457
|
Merge branch 'master' into int3
|
2018-04-03 16:27:32 -04:00 |
|
Gennadiy Civil
|
75ea13deb2
|
Merge branch 'master' of github.com:google/googletest
|
2018-04-03 16:15:16 -04:00 |
|
Gennadiy Civil
|
d52aaee8eb
|
Upstreaming, cl 191344765
|
2018-04-03 16:14:35 -04:00 |
|
Gennadiy Civil
|
ac783bd787
|
Merge pull request #1539 from gennadiycivil/master
merging port, continue
|
2018-04-03 15:26:44 -04:00 |
|
Gennadiy Civil
|
27507429cb
|
Merge branch 'master' into int3
|
2018-04-03 11:44:23 -04:00 |
|
Gennadiy Civil
|
a2dd136578
|
merging port, cont. 191443078
|
2018-04-03 11:38:30 -04:00 |
|
Gennadiy Civil
|
1065591bdb
|
Merge branch 'master' of github.com:google/googletest
|
2018-04-03 11:24:45 -04:00 |
|
Gennadiy Civil
|
aa349acb07
|
merging, cont - 2
|
2018-04-03 11:23:54 -04:00 |
|
Gennadiy Civil
|
6c9d07f112
|
Merge pull request #1538 from gennadiycivil/master
merging , cont
|
2018-04-03 11:18:56 -04:00 |
|
Gennadiy Civil
|
6abaa2467b
|
Merge branch 'master' of github.com:google/googletest
|
2018-04-03 11:06:34 -04:00 |
|
Gennadiy Civil
|
2cedd5b9c1
|
merging gtest-port.h , 191439094
|
2018-04-03 11:06:20 -04:00 |
|
Gennadiy Civil
|
653a435f99
|
Merge pull request #1537 from gennadiycivil/master
gtest-port.h merge
|
2018-04-03 10:09:08 -04:00 |
|
Gennadiy Civil
|
04d1e56bd2
|
merging, just comments format
|
2018-04-03 09:56:23 -04:00 |
|
Gennadiy Civil
|
5beb452bbe
|
testing, merge
|
2018-04-03 09:45:49 -04:00 |
|
Gennadiy Civil
|
b8cbd53e02
|
Merge branch 'master' of github.com:google/googletest
|
2018-04-03 09:31:49 -04:00 |
|
Gennadiy Civil
|
df5a48da03
|
Testing, gtest-port.h merge
|
2018-04-03 09:31:10 -04:00 |
|
Gennadiy Civil
|
9df719da8d
|
Merge pull request #1534 from gennadiycivil/master
merging gtest-port.h, again - 1
|
2018-04-02 16:03:22 -04:00 |
|
Gennadiy Civil
|
87a4cdddd0
|
merging gtest-port.h, again - 1
|
2018-04-02 14:22:24 -04:00 |
|
Roland Leißa
|
b1d18b85bd
|
Merge branch 'master' into int3
|
2018-03-30 03:16:20 +02:00 |
|
Gennadiy Civil
|
7888184f28
|
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
|
86d14079be
|
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
|
b2373c6f51
|
Revert "merging gtest-port 1 of N"
|
2018-03-29 13:28:29 -04:00 |
|
Gennadiy Civil
|
527fd38867
|
Merge pull request #1526 from google/revert-1525-master
Revert "merging gtest-port, 2"
|
2018-03-29 13:28:04 -04:00 |
|
Gennadiy Civil
|
54bb165ffd
|
Revert "merging gtest-port, 2"
|
2018-03-29 13:27:11 -04:00 |
|
Roland Leißa
|
e10ea42274
|
Merge remote-tracking branch 'google/master' into int3
|
2018-03-29 16:39:40 +02:00 |
|
Roland Leißa
|
d04bf07fad
|
typo
|
2018-03-29 16:38:23 +02:00 |
|
Gennadiy Civil
|
09a0e17c6a
|
Merge pull request #1525 from gennadiycivil/master
merging gtest-port, 2
|
2018-03-29 10:24:19 -04:00 |
|
Gennadiy Civil
|
8e0364a37b
|
merging gtest-port, 2
|
2018-03-29 09:46:13 -04:00 |
|
Roland Leißa
|
11855d8ef0
|
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
|
9dde7c4e8c
|
Merge pull request #1518 from gennadiycivil/master
merging gtest-port 1 of N
|
2018-03-27 15:39:32 -04:00 |
|
Gennadiy Civil
|
aea6fc32aa
|
merging gtest-port 1 of N
|
2018-03-27 15:19:40 -04:00 |
|
Gennadiy Civil
|
cafa9e5228
|
Merge pull request #1515 from gennadiycivil/master
merges
|
2018-03-26 14:10:38 -04:00 |
|
Gennadiy Civil
|
a75a5c9706
|
merges 1
|
2018-03-26 13:14:00 -04:00 |
|
Gennadiy Civil
|
a0e2faf480
|
Merge branch 'master' of https://github.com/google/googletest
|
2018-03-26 13:04:34 -04:00 |
|
Gennadiy Civil
|
3df7cbe6f7
|
merges, gtest
|
2018-03-26 13:04:28 -04:00 |
|
Gennadiy Civil
|
78579756a8
|
Merge pull request #1512 from gennadiycivil/master
merges, gmock - 1
|
2018-03-26 11:19:10 -04:00 |
|
Gennadiy Civil
|
6aae206bc2
|
merging gmock-matchers.h 3
|
2018-03-26 10:36:26 -04:00 |
|
Gennadiy Civil
|
23187058e7
|
merging gmock-matchers.h 2
|
2018-03-26 10:16:59 -04:00 |
|
Gennadiy Civil
|
8ea10d3878
|
Upstreaming FloatingEq2Matcher,
|
2018-03-26 09:28:16 -04:00 |
|
Gennadiy Civil
|
b907c26740
|
Merging gmock-matchers.h -2
|
2018-03-23 11:42:41 -04:00 |
|
Gennadiy Civil
|
466a49ae30
|
gmock-matchers merging -2
|
2018-03-23 11:23:54 -04:00 |
|
Gennadiy Civil
|
a28a7eb5e9
|
Merge branch 'master' of https://github.com/google/googletest
|
2018-03-22 16:24:51 -04:00 |
|
Gennadiy Civil
|
dfa853b63d
|
Merge pull request #1510 from gennadiycivil/master
More merges, restruct some
|
2018-03-22 16:21:26 -04:00 |
|