diff options
| author | Bernhard Bauer <sheepmaster@gmail.com> | 2018-03-12 18:15:35 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-12 18:15:35 +0000 |
| commit | fc437ef4b2c0a0302a6b0771c334ca51dc1ccf7d (patch) | |
| tree | 0718a372bf66172bf4d3415eca6eb5d1f96b41fa /googlemock/include/gmock/gmock.h | |
| parent | 7b70413e0ca57b3e48d7655f342122f159f52b31 (diff) | |
| parent | abc6e943e0878af67b91fa8a646edf717195c80c (diff) | |
| download | googletest-fc437ef4b2c0a0302a6b0771c334ca51dc1ccf7d.tar.gz googletest-fc437ef4b2c0a0302a6b0771c334ca51dc1ccf7d.tar.bz2 googletest-fc437ef4b2c0a0302a6b0771c334ca51dc1ccf7d.zip | |
Merge branch 'master' into upstream_188748737
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" |