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

Unified Diff: third_party/robolectric/licenses/pivotal.labs.license.txt

Issue 1124763003: Update from https://crrev.com/327068 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: update nacl, buildtools, fix display_change_notifier_unittest Created 5 years, 7 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
Index: third_party/robolectric/licenses/pivotal.labs.license.txt
diff --git a/third_party/smhasher/LICENSE b/third_party/robolectric/licenses/pivotal.labs.license.txt
similarity index 87%
copy from third_party/smhasher/LICENSE
copy to third_party/robolectric/licenses/pivotal.labs.license.txt
index 3f18a844ad0be4ca83c084b9cff5bcf020704b1e..c9dccb8d80b9b1f47b23f0302627600fdef8d56e 100644
--- a/third_party/smhasher/LICENSE
+++ b/third_party/robolectric/licenses/pivotal.labs.license.txt
@@ -1,8 +1,6 @@
-All MurmurHash source files are placed in the public domain.
+The MIT License
-The license below applies to all other code in SMHasher:
-
-Copyright (c) 2011 Google, Inc.
+Copyright (c) 2010 Xtreme Labs and Pivotal Labs
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

Powered by Google App Engine
This is Rietveld 408576698