diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-06-29 08:49:49 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-06-29 08:49:49 -0700 |
| commit | 4d74056b0806f68397111dc2b16f56386339b8e0 (patch) | |
| tree | 1dbc5b1a713ad69576842b97a3dd1522ae3a23b6 /vsprojects/protoc.props | |
| parent | acf0f07dfcb8db090528d6dc4dd7a6f7c1132f30 (diff) | |
| parent | ee98d84a02266acd7da5ed769a7eb3f18599d914 (diff) | |
Merge branch 'forever-is-a-long-time' into tis-but-thy-name
Conflicts:
Makefile
vsprojects/Grpc.mak
Diffstat (limited to 'vsprojects/protoc.props')
0 files changed, 0 insertions, 0 deletions