| commit | d3280c209af3a4b743d9db7b7c46b2b4bda6c115 | [log] [tgz] |
|---|---|---|
| author | Alex Ruiz <alruiz@google.com> | Thu Sep 22 22:30:53 2011 -0700 |
| committer | Alex Ruiz <alruiz@google.com> | Thu Sep 22 22:30:53 2011 -0700 |
| tree | ac32fc86e9435254193d0a1741b934bbd480815f | |
| parent | 291bfce8e47e2aa1add78a65c4009be2ddb2d355 [diff] | |
| parent | d99ad28f3571f7c809b780dfb1e84842fc08ac18 [diff] |
Merge branch 'master' of https://code.google.com/p/protobuf-dt/ into option-ref Conflicts: com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/scoping/ProtoDescriptor.java