diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2010-01-08 16:49:55 -0800 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2010-01-08 16:49:55 -0800 |
| commit | e60233062f0744249b00f8eb0e079851525a21f3 (patch) | |
| tree | cbc2a1a823df0d0696f79b045c7e834bb56037d8 /src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.sln | |
| parent | 07c9f0a7b83d4399aeab5a57ea2ae57ac8459fb6 (diff) | |
| parent | 55e1ef5ec8417f33da4ff83d9083cf7369c8bfff (diff) | |
| download | DotNetOpenAuth-e60233062f0744249b00f8eb0e079851525a21f3.zip DotNetOpenAuth-e60233062f0744249b00f8eb0e079851525a21f3.tar.gz DotNetOpenAuth-e60233062f0744249b00f8eb0e079851525a21f3.tar.bz2 | |
Merge branch 'master' into mvcProjTemplate
Conflicts:
projecttemplates/RelyingPartyLogic/Utilities.cs
src/DotNetOpenAuth.sln
Diffstat (limited to 'src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.sln')
| -rw-r--r-- | src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.sln | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.sln b/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.sln index fca41e8..0d0900b 100644 --- a/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.sln +++ b/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.sln @@ -8,6 +8,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution ..\..\build.proj = ..\..\build.proj ..\..\lib\DotNetOpenAuth.BuildTasks.targets = ..\..\lib\DotNetOpenAuth.BuildTasks.targets ..\..\tools\DotNetOpenAuth.Common.Settings.targets = ..\..\tools\DotNetOpenAuth.Common.Settings.targets + ..\..\tools\DotNetOpenAuth.props = ..\..\tools\DotNetOpenAuth.props + ..\..\tools\DotNetOpenAuth.targets = ..\..\tools\DotNetOpenAuth.targets ..\..\tools\DotNetOpenAuth.Versioning.targets = ..\..\tools\DotNetOpenAuth.Versioning.targets EndProjectSection EndProject |