diff options
author | Andrew Arnott <andrewarnott@gmail.com> | 2009-12-13 15:25:54 -0800 |
---|---|---|
committer | Andrew Arnott <andrewarnott@gmail.com> | 2009-12-13 15:25:54 -0800 |
commit | 39dacc2ff566232076eb4dc39f6d57e1ced4913e (patch) | |
tree | 100b82887033c9bc6d700f549ef1b4f1766f3de7 /lib | |
parent | ab55daeac668ff4fe38daa458df08aa4b8b2d3a3 (diff) | |
parent | 072a488bd47854ec5475a1a2a7a42fd5b0e7a88b (diff) | |
download | DotNetOpenAuth-39dacc2ff566232076eb4dc39f6d57e1ced4913e.zip DotNetOpenAuth-39dacc2ff566232076eb4dc39f6d57e1ced4913e.tar.gz DotNetOpenAuth-39dacc2ff566232076eb4dc39f6d57e1ced4913e.tar.bz2 |
Merge branch 'v3.3'
Conflicts:
src/DotNetOpenAuth.vsmdi
src/version.txt
Diffstat (limited to 'lib')
-rw-r--r-- | lib/DotNetOpenAuth.BuildTasks.dll | bin | 55296 -> 56832 bytes | |||
-rw-r--r-- | lib/DotNetOpenAuth.BuildTasks.pdb | bin | 138752 -> 142848 bytes | |||
-rw-r--r-- | lib/DotNetOpenAuth.BuildTasks.targets | 1 |
3 files changed, 1 insertions, 0 deletions
diff --git a/lib/DotNetOpenAuth.BuildTasks.dll b/lib/DotNetOpenAuth.BuildTasks.dll Binary files differindex 2a6f57a..7ee2a0f 100644 --- a/lib/DotNetOpenAuth.BuildTasks.dll +++ b/lib/DotNetOpenAuth.BuildTasks.dll diff --git a/lib/DotNetOpenAuth.BuildTasks.pdb b/lib/DotNetOpenAuth.BuildTasks.pdb Binary files differindex 9d2b6ed..ec57153 100644 --- a/lib/DotNetOpenAuth.BuildTasks.pdb +++ b/lib/DotNetOpenAuth.BuildTasks.pdb diff --git a/lib/DotNetOpenAuth.BuildTasks.targets b/lib/DotNetOpenAuth.BuildTasks.targets index 1cad9a1..27dbd10 100644 --- a/lib/DotNetOpenAuth.BuildTasks.targets +++ b/lib/DotNetOpenAuth.BuildTasks.targets @@ -26,5 +26,6 @@ <UsingTask AssemblyFile="$(ProjectRoot)\lib\DotNetOpenAuth.BuildTasks.dll" TaskName="FixupReferenceHintPaths" /> <UsingTask AssemblyFile="$(ProjectRoot)\lib\DotNetOpenAuth.BuildTasks.dll" TaskName="AddProjectItems" /> <UsingTask AssemblyFile="$(ProjectRoot)\lib\DotNetOpenAuth.BuildTasks.dll" TaskName="Purge" /> + <UsingTask AssemblyFile="$(ProjectRoot)\lib\DotNetOpenAuth.BuildTasks.dll" TaskName="FixupShippingToolSamples" /> </Project> |