diff options
| author | Jeff Davidson <jpd@google.com> | 2015-01-15 22:48:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-01-15 22:48:58 +0000 |
| commit | 77a6b2f4cdd580d57630f079db1d908d7fd90a54 (patch) | |
| tree | 586f7d5e9a7e05af45d0e821188097c0faa96219 /src/google/protobuf/unittest_import.proto | |
| parent | c7c25812eb19d080087b71e08bfe35aff9f21433 (diff) | |
| parent | a3b2a6da25a76f17c73d31def3952feb0fd2296e (diff) | |
| download | external_protobuf-77a6b2f4cdd580d57630f079db1d908d7fd90a54.zip external_protobuf-77a6b2f4cdd580d57630f079db1d908d7fd90a54.tar.gz external_protobuf-77a6b2f4cdd580d57630f079db1d908d7fd90a54.tar.bz2 | |
Merge "Update protobuf library from 2.3 to 2.6."
Diffstat (limited to 'src/google/protobuf/unittest_import.proto')
| -rw-r--r-- | src/google/protobuf/unittest_import.proto | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/google/protobuf/unittest_import.proto b/src/google/protobuf/unittest_import.proto index cd533ec..c115b11 100644 --- a/src/google/protobuf/unittest_import.proto +++ b/src/google/protobuf/unittest_import.proto @@ -49,6 +49,9 @@ option java_package = "com.google.protobuf.test"; // Do not set a java_outer_classname here to verify that Proto2 works without // one. +// Test public import +import public "google/protobuf/unittest_import_public.proto"; + message ImportMessage { optional int32 d = 1; } |