diff options
| author | Tanzinul Islam <tanzislam@users.noreply.github.com> | 2018-03-05 02:25:59 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-05 02:25:59 +0000 |
| commit | a7a7f51d355081a7f1e8ab295d5df5f9bb4612c8 (patch) | |
| tree | c6f8f6067f957eb6d49656278f79c93353bb039c /googlemock/include/gmock/gmock.h | |
| parent | 4ba3803f936a2f432e60841bc9358ea2f3a951eb (diff) | |
| parent | 6c73adfc03e277f55cb1e4947b3a5e6c5ff4fe46 (diff) | |
| download | googletest-a7a7f51d355081a7f1e8ab295d5df5f9bb4612c8.tar.gz googletest-a7a7f51d355081a7f1e8ab295d5df5f9bb4612c8.tar.bz2 googletest-a7a7f51d355081a7f1e8ab295d5df5f9bb4612c8.zip | |
Merge branch 'master' 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" |