aboutsummaryrefslogtreecommitdiff
path: root/csharp/src/Google.Protobuf.sln
diff options
context:
space:
mode:
authorJoshua Haberman <jhaberman@gmail.com>2016-02-24 10:50:03 -0800
committerJoshua Haberman <jhaberman@gmail.com>2016-02-24 10:50:03 -0800
commitcc775f7ac1589eda26fc65602d228baef8001944 (patch)
treebfaa2561a7d6039166cf4c6956f9450e4d0ac9eb /csharp/src/Google.Protobuf.sln
parentfc51bdc033f458d14273bf6605dad4157e609c84 (diff)
parent786f80fe6632902be74f90a577d75e8641494abd (diff)
downloadprotobuf-cc775f7ac1589eda26fc65602d228baef8001944.tar.gz
protobuf-cc775f7ac1589eda26fc65602d228baef8001944.tar.bz2
protobuf-cc775f7ac1589eda26fc65602d228baef8001944.zip
Merge pull request #1259 from silviulica/master
Add a modified patch from craigcitro@ to handle namespace sharing.
Diffstat (limited to 'csharp/src/Google.Protobuf.sln')
0 files changed, 0 insertions, 0 deletions