diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2010-10-24 15:56:48 -0700 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2010-10-24 15:56:48 -0700 |
| commit | 9dbb9aab73812202648c4e68d60261dd84d6c8e2 (patch) | |
| tree | 5de139019a7b2f870f84c57cac36c0e489bd1e41 /src/DotNetOpenAuth.Test/OAuth/OAuthCoordinator.cs | |
| parent | 4b27c330fbfb3a260aa3bd6a9b1232ee3b53deb0 (diff) | |
| parent | e7ce41355c38b3125729a62920231f274b7a2100 (diff) | |
| download | DotNetOpenAuth-origin/mono2.zip DotNetOpenAuth-origin/mono2.tar.gz DotNetOpenAuth-origin/mono2.tar.bz2 | |
Merge branch 'v3.2' into mono2origin/mono2
Conflicts:
src/DotNetOpenAuth/Messaging/HttpRequestInfo.cs
Diffstat (limited to 'src/DotNetOpenAuth.Test/OAuth/OAuthCoordinator.cs')
| -rw-r--r-- | src/DotNetOpenAuth.Test/OAuth/OAuthCoordinator.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/DotNetOpenAuth.Test/OAuth/OAuthCoordinator.cs b/src/DotNetOpenAuth.Test/OAuth/OAuthCoordinator.cs index ce548a9..c3ef6c2 100644 --- a/src/DotNetOpenAuth.Test/OAuth/OAuthCoordinator.cs +++ b/src/DotNetOpenAuth.Test/OAuth/OAuthCoordinator.cs @@ -4,7 +4,7 @@ // </copyright> //----------------------------------------------------------------------- -namespace DotNetOpenAuth.Test { +namespace DotNetOpenAuth.Test.OAuth { using System; using DotNetOpenAuth.Messaging; using DotNetOpenAuth.Messaging.Bindings; |