Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(86)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/pymock/LICENSE.txt

Issue 664803003: Update from chromium a8e7c94b1b79a0948d05a1fcfff53391d22ce37a (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/modp_b64/BUILD.gn ('k') | third_party/pymock/OWNERS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/pymock/LICENSE.txt
diff --git a/third_party/jinja2/LICENSE b/third_party/pymock/LICENSE.txt
similarity index 83%
copy from third_party/jinja2/LICENSE
copy to third_party/pymock/LICENSE.txt
index 31bf900e58e30fefda848353470298a254b9e47b..7891703b13475d2eb74260d9b82af1cdba48ac9a 100644
--- a/third_party/jinja2/LICENSE
+++ b/third_party/pymock/LICENSE.txt
@@ -1,6 +1,5 @@
-Copyright (c) 2009 by the Jinja Team, see AUTHORS for more details.
-
-Some rights reserved.
+Copyright (c) 2003-2012, Michael Foord
+All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
@@ -14,10 +13,6 @@ met:
disclaimer in the documentation and/or other materials provided
with the distribution.
- * The names of the contributors may not be used to endorse or
- promote products derived from this software without specific
- prior written permission.
-
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
« no previous file with comments | « third_party/modp_b64/BUILD.gn ('k') | third_party/pymock/OWNERS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698