| commit | b049ba8fc4792f283db410caf561d05c361d43d2 | [log] [tgz] |
|---|---|---|
| author | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | Fri Jan 23 02:06:18 2015 +0100 |
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | Fri Jan 23 02:06:18 2015 +0100 |
| tree | 2d56bade7205322e7b00dc440687ad0683ce825b | |
| parent | cc0994c8cbd302aa99483e42d6d2855b0cd59fd4 [diff] | |
| parent | fdd76ba414cde7e7ae827183fcf04c9b2874adf6 [diff] |
Merge branch 'master' of github.com:google/grpc into vsprojects Conflicts: templates/vsprojects/vs2013/grpc.sln.template