diff options
| author |  Feng Xiao <xiaofeng@google.com> | 2015-11-05 16:35:34 -0800 |
|---|---|---|
| committer | Feng Xiao <xiaofeng@google.com> | 2015-11-05 16:35:34 -0800 |
| commit | 1470ced7ce6f8f5b42e0747ebbea1754db4a3310 (patch) | |
| tree | aed8a745850035647897d44cd7ed89536357d190 /csharp/src/Google.Protobuf.Conformance | |
| parent | 3a72a1eeafa4cd6747d0039a527caa49924aa265 (diff) | |
| parent | 37b262bfb467533d10ca29b9fc55310dd15a3aea (diff) | |
Merge pull request #950 from jhump/jh/plugin-proto-in-java-runtime
include plugin.proto and generated code in protobuf-java
Diffstat (limited to 'csharp/src/Google.Protobuf.Conformance')
0 files changed, 0 insertions, 0 deletions