diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2012-01-29 15:05:32 -0800 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2012-01-29 15:05:32 -0800 |
| commit | c20bca6e589aeb3176e755a210a5b75565106017 (patch) | |
| tree | 24716e579d6e8af4871c4873efdad11185bf41b4 /tools/NUnit/samples/cpp/cpp-cli/syntax/AssemblyInfo.cpp | |
| parent | 5fec515095ee10b522f414a03e78f282aaf520dc (diff) | |
| parent | fc0c0e297798f12e556917dbb27f7966c181df10 (diff) | |
| download | DotNetOpenAuth-c20bca6e589aeb3176e755a210a5b75565106017.zip DotNetOpenAuth-c20bca6e589aeb3176e755a210a5b75565106017.tar.gz DotNetOpenAuth-c20bca6e589aeb3176e755a210a5b75565106017.tar.bz2 | |
Merge branch 'v3.4'
Conflicts:
nuget/nuget.proj
samples/OpenIdOfflineProvider/OpenIdOfflineProvider.csproj
src/DotNetOpenAuth/DotNetOpenAuth.csproj
src/DotNetOpenAuth/Messaging/Reflection/MessageDescription.cs
tools/DotNetOpenAuth.props
Diffstat (limited to 'tools/NUnit/samples/cpp/cpp-cli/syntax/AssemblyInfo.cpp')
0 files changed, 0 insertions, 0 deletions