aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/unittest_preserve_unknown_enum.proto
Commit message (Collapse)AuthorAgeFilesLines
* More cleanup, based around searches for "Google.ProtocolBuffers"Jon Skeet2015-06-261-1/+1
| | | | | | | - Remove some old proto2-based C#-only messages - Remove the "build" directory which only contained out-of-date files - Remove the csharp_namespace option from proto2 messages - Change "Google.ProtocolBuffers" to "Google.Protobuf" in other messages
* down-integrate internal changesBo Yang2015-05-211-2/+2
|
* Merge branch 'master' of github.com:google/protobuf into integrate_from_masterJan Tattermusch2015-05-131-0/+1
|\
| * Alpha 1 drop of Google's Objective C plugin and runtime support for protobufs.Thomas Van Lenten2015-05-061-0/+1
| |
* | Add C# namespace to .proto files (e.g. descriptors, unit tests)Jon Skeet2015-05-061-0/+2
|/
* Down integrate from Google internal branch for C++ and Java.Jisi Liu2015-02-281-5/+7
| | | | | | | | - Maps for C++ lite - C++ Arena optimizations. - Java Lite runtime code size optimization. Change-Id: I7537a4357c1cb385d23f9e8aa7ffdfeefe079f13
* Down-integrate from internal code base.Feng Xiao2014-11-101-0/+66