| commit | 24c42e32b7dc390edc886fc3a645cb3b8f8e963a | [log] [tgz] |
|---|---|---|
| author | Alex Ruiz <alruiz@google.com> | Tue Nov 08 14:45:07 2011 -0800 |
| committer | Alex Ruiz <alruiz@google.com> | Tue Nov 08 14:45:07 2011 -0800 |
| tree | a23ac4d9da0a3de1e6754b351a07b4840ed9c9e1 | |
| parent | 8c07b5d842da7835e79568835a827c051412ea9b [diff] | |
| parent | 8760c31f8a8fc38213e65430bfe8b38f1eb7ffd5 [diff] |
Merge branch 'master' of https://code.google.com/p/protobuf-dt/ Conflicts: com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/ProtobufRuntimeModule.java com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/validation/ProtobufResourceValidator.java