diff options
| author | Tanzinul Islam <t_17_7@hotmail.com> | 2018-03-05 09:02:59 +0000 |
|---|---|---|
| committer | Tanzinul Islam <t_17_7@hotmail.com> | 2018-03-05 09:02:59 +0000 |
| commit | 6d089311ca2a6fd83dff9ed68c1d3eb00c1443d0 (patch) | |
| tree | c6f8f6067f957eb6d49656278f79c93353bb039c /googlemock/include/gmock/gmock.h | |
| parent | 555e6e79485151cf8c8ada55d57d9ed872591dc5 (diff) | |
| parent | a7a7f51d355081a7f1e8ab295d5df5f9bb4612c8 (diff) | |
| download | googletest-6d089311ca2a6fd83dff9ed68c1d3eb00c1443d0.tar.gz googletest-6d089311ca2a6fd83dff9ed68c1d3eb00c1443d0.tar.bz2 googletest-6d089311ca2a6fd83dff9ed68c1d3eb00c1443d0.zip | |
Merge branch 'fix_death_test_child_mingw_wer_issue1116' of https://github.com/tanzislam/googletest into fix_death_test_child_mingw_wer_issue1116
Diffstat (limited to 'googlemock/include/gmock/gmock.h')
| -rw-r--r-- | googlemock/include/gmock/gmock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googlemock/include/gmock/gmock.h b/googlemock/include/gmock/gmock.h index 5764bc85..6ccb118b 100644 --- a/googlemock/include/gmock/gmock.h +++ b/googlemock/include/gmock/gmock.h @@ -59,8 +59,8 @@ #include "gmock/gmock-cardinalities.h" #include "gmock/gmock-generated-actions.h" #include "gmock/gmock-generated-function-mockers.h" -#include "gmock/gmock-generated-nice-strict.h" #include "gmock/gmock-generated-matchers.h" +#include "gmock/gmock-generated-nice-strict.h" #include "gmock/gmock-matchers.h" #include "gmock/gmock-more-actions.h" #include "gmock/gmock-more-matchers.h" |