| Index: third_party/protobuf26/descriptor_pool.py
|
| diff --git a/third_party/google/protobuf/descriptor_pool.py b/third_party/protobuf26/descriptor_pool.py
|
| similarity index 99%
|
| rename from third_party/google/protobuf/descriptor_pool.py
|
| rename to third_party/protobuf26/descriptor_pool.py
|
| index 372f458f551e2ffb20eecb795a80cbfc93066264..882fd9f2caef6b1390c8133dfb078b5409910d2a 100644
|
| --- a/third_party/google/protobuf/descriptor_pool.py
|
| +++ b/third_party/protobuf26/descriptor_pool.py
|
| @@ -59,9 +59,9 @@ __author__ = 'matthewtoia@google.com (Matt Toia)'
|
|
|
| import sys
|
|
|
| -from google.protobuf import descriptor
|
| -from google.protobuf import descriptor_database
|
| -from google.protobuf import text_encoding
|
| +from protobuf26 import descriptor
|
| +from protobuf26 import descriptor_database
|
| +from protobuf26 import text_encoding
|
|
|
|
|
| def _NormalizeFullyQualifiedName(name):
|
|
|