diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2010-08-06 20:06:39 -0700 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2010-08-06 20:06:39 -0700 |
| commit | 3fc2197494753c56019f40aabbe399c4567f49b5 (patch) | |
| tree | 35c7076934264f31b19ad1de71a54c59e1e3ec2f /src | |
| parent | 534782b1a7e5690117beaef7ed80119f366358d0 (diff) | |
| parent | 1d084520340f37f516658cb2fd407007af3a8521 (diff) | |
| download | DotNetOpenAuth-3fc2197494753c56019f40aabbe399c4567f49b5.zip DotNetOpenAuth-3fc2197494753c56019f40aabbe399c4567f49b5.tar.gz DotNetOpenAuth-3fc2197494753c56019f40aabbe399c4567f49b5.tar.bz2 | |
Merge branch 'v3.3' into v3.4
Conflicts:
src/DotNetOpenAuth.Test/DotNetOpenAuth.Test.csproj
src/DotNetOpenAuth.Test/Mocks/MockHttpRequest.cs
src/DotNetOpenAuth.Test/OpenId/AssociationHandshakeTests.cs
src/DotNetOpenAuth.Test/OpenId/Extensions/ExtensionsInteropHelperRPRequestTests.cs
src/DotNetOpenAuth.Test/OpenId/RelyingParty/AuthenticationRequestTests.cs
src/DotNetOpenAuth/DotNetOpenAuth.csproj
src/DotNetOpenAuth/Messaging/IMessageWithBinaryData.cs
src/DotNetOpenAuth/OpenId/IIdentifierDiscoveryService.cs
src/DotNetOpenAuth/OpenId/RelyingParty/AuthenticationRequest.cs
src/DotNetOpenAuth/OpenId/RelyingParty/IXrdsProviderEndpointContract.cs
Diffstat (limited to 'src')
| -rw-r--r-- | src/.gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/.gitignore b/src/.gitignore index 558242d..22d54e5 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -1,4 +1,5 @@ PrecompiledWeb +_ReSharper.* *.suo *.cache *.user |