Index: third_party/re2/README.chromium |
diff --git a/third_party/re2/README.chromium b/third_party/re2/README.chromium |
index 179b020e0fd19061b303a51b8bbab71c18a23a7a..56a3f8118a20b8533f83900470a3aee3d4eca154 100644 |
--- a/third_party/re2/README.chromium |
+++ b/third_party/re2/README.chromium |
@@ -29,3 +29,4 @@ Local Modifications (to be applied in this order): |
- Remove comparisons of this with NULL, merges upstream b92ce81f1e25 |
- Let COMPILE_ASSERT use static_assert if available, merges upstream |
2225f94df8ec |
+- Merge upstream cc56ba02d9d2bdafa614ad5ebf564dde287625bb. |