diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2010-01-14 08:32:33 -0800 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2010-01-14 08:32:33 -0800 |
| commit | 3ab3290535a987d8e466448e29bce16be443a2d7 (patch) | |
| tree | ff6ed166da445a5bf72d581c0b45172a4c3e3536 /lib/DotNetOpenAuth.BuildTasks.dll | |
| parent | 206c0120e3e1838fdf5b4239918cc8b0ad07102b (diff) | |
| parent | a089cb8965e95f63f59781815ed49ba0c3e43f00 (diff) | |
| download | DotNetOpenAuth-3ab3290535a987d8e466448e29bce16be443a2d7.zip DotNetOpenAuth-3ab3290535a987d8e466448e29bce16be443a2d7.tar.gz DotNetOpenAuth-3ab3290535a987d8e466448e29bce16be443a2d7.tar.bz2 | |
Merge branch 'v3.3' into v3.4
Conflicts:
lib/DotNetOpenAuth.BuildTasks.dll
lib/DotNetOpenAuth.BuildTasks.pdb
src/DotNetOpenAuth.vsmdi
Diffstat (limited to 'lib/DotNetOpenAuth.BuildTasks.dll')
| -rw-r--r-- | lib/DotNetOpenAuth.BuildTasks.dll | bin | 60416 -> 61440 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/lib/DotNetOpenAuth.BuildTasks.dll b/lib/DotNetOpenAuth.BuildTasks.dll Binary files differindex 402d176..ec96016 100644 --- a/lib/DotNetOpenAuth.BuildTasks.dll +++ b/lib/DotNetOpenAuth.BuildTasks.dll |