diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2010-01-07 10:11:34 -0800 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2010-01-07 10:11:34 -0800 |
| commit | 70f5ef295534568ca14b999f775ce7608c61409a (patch) | |
| tree | e0ab4541934ec664793a39dcdf10bcfe91a620b1 /src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.csproj | |
| parent | 31ccf82839df6eb5c4f1727280932de8f3ab9ee9 (diff) | |
| parent | 187459a79ff25431a29f64470f7d9e84be87f156 (diff) | |
| download | DotNetOpenAuth-70f5ef295534568ca14b999f775ce7608c61409a.zip DotNetOpenAuth-70f5ef295534568ca14b999f775ce7608c61409a.tar.gz DotNetOpenAuth-70f5ef295534568ca14b999f775ce7608c61409a.tar.bz2 | |
Merge branch 'master' into master-Dev10
Conflicts:
src/DotNetOpenAuth/DotNetOpenAuth.csproj
src/DotNetOpenAuth/InfoCard/Token/Token.cs
src/DotNetOpenAuth/Messaging/Channel.cs
src/DotNetOpenAuth/Messaging/HttpRequestInfo.cs
src/DotNetOpenAuth/OpenId/Realm.cs
Diffstat (limited to 'src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.csproj')
0 files changed, 0 insertions, 0 deletions