gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into chore/fix_library_json

Browse Source
This commit is contained in:
Chris Johnson
2019-01-03 21:13:20 -06:00
committed by GitHub
parent 0c0ca90382 3880b13e4c
commit 0ffa5f9779
74 changed files with 2283 additions and 2818 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
googlemock/include/gmock/gmock.h
View File

@@ -62,10 +62,10 @@
#include "gmock/gmock-generated-actions.h"
#include "gmock/gmock-generated-function-mockers.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"
#include "gmock/gmock-nice-strict.h"
#include "gmock/internal/gmock-internal-utils.h"
namespace testing {