diff options
| author | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2010-03-25 20:17:31 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2010-03-25 20:17:31 +0000 |
| commit | 6a73d4eeae70ac77356df6be9a97012294994488 (patch) | |
| tree | c60c738bced0272706f05bce6dc057440dd5cbdb | |
| parent | 129dedd542cdc76b4889dcdb8ce0d38690e13544 (diff) | |
| download | googlemock-6a73d4eeae70ac77356df6be9a97012294994488.tar.gz | |
Adds Manuel to CONTRIBUTORS, and pulls in gtest r405.
git-svn-id: http://googlemock.googlecode.com/svn/trunk@280 8415998a-534a-0410-bf83-d39667b30386
| -rw-r--r-- | CONTRIBUTORS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 9a8cc2e..6e9ae36 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -19,6 +19,7 @@ Keir Mierle <mierle@gmail.com> Keith Ray <keith.ray@gmail.com> Kostya Serebryany <kcc@google.com> Lev Makhlis +Manuel Klimek <klimek@google.com> Mario Tanev <radix@google.com> Mark Paskin Markus Heule <markus.heule@gmail.com> |