| Index: tools/grit/LICENSE
|
| diff --git a/third_party/pymock/LICENSE.txt b/tools/grit/LICENSE
|
| similarity index 64%
|
| copy from third_party/pymock/LICENSE.txt
|
| copy to tools/grit/LICENSE
|
| index 7891703b13475d2eb74260d9b82af1cdba48ac9a..2aa394490ca33cffcb0a21fbda8782c987c0524d 100644
|
| --- a/third_party/pymock/LICENSE.txt
|
| +++ b/tools/grit/LICENSE
|
| @@ -1,23 +1,22 @@
|
| -Copyright (c) 2003-2012, Michael Foord
|
| +Copyright (c) 2012 The Chromium Authors.
|
| All rights reserved.
|
|
|
| Redistribution and use in source and binary forms, with or without
|
| modification, are permitted provided that the following conditions are
|
| met:
|
|
|
| - * Redistributions of source code must retain the above copyright
|
| - notice, this list of conditions and the following disclaimer.
|
| +Redistributions of source code must retain the above copyright notice,
|
| +this list of conditions and the following disclaimer.
|
|
|
| - * Redistributions in binary form must reproduce the above
|
| - copyright notice, this list of conditions and the following
|
| - disclaimer in the documentation and/or other materials provided
|
| - with the distribution.
|
| +Redistributions in binary form must reproduce the above copyright
|
| +notice, this list of conditions and the following disclaimer in the
|
| +documentation and/or other materials provided with the distribution.
|
|
|
| THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
| "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
| LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
| A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
| -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
| +HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
| SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
| LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
| DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
|