diff options
| author | Jacob Schloss <jschloss@swiftengineering.com> | 2018-08-22 19:55:43 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-22 19:55:43 (GMT) |
| commit | 6de39826aa190a07179a8104c00ad11ea20d8679 (patch) | |
| tree | 3413eb72b75b6aad6392407713f5596c0f477fd6 /googlemock/src/gmock-matchers.cc | |
| parent | 6e7980164593bfe888d6e94ee52d4d08bdddb412 (diff) | |
| parent | 1d9a1912e7f42e8ae66ea365b5b8508fecb31509 (diff) | |
| download | googletest-6de39826aa190a07179a8104c00ad11ea20d8679.zip googletest-6de39826aa190a07179a8104c00ad11ea20d8679.tar.gz googletest-6de39826aa190a07179a8104c00ad11ea20d8679.tar.bz2 | |
Merge branch 'master' into issue_1735
Diffstat (limited to 'googlemock/src/gmock-matchers.cc')
| -rw-r--r-- | googlemock/src/gmock-matchers.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/googlemock/src/gmock-matchers.cc b/googlemock/src/gmock-matchers.cc index 194d992..f8ddff1 100644 --- a/googlemock/src/gmock-matchers.cc +++ b/googlemock/src/gmock-matchers.cc @@ -26,8 +26,7 @@ // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) + // Google Mock - a framework for writing C++ mock classes. // |