diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2010-02-13 06:10:55 -0800 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2010-02-13 06:10:55 -0800 |
| commit | 66e2b799c300cd6af3a42d4c4b297718a9f79f04 (patch) | |
| tree | b356864526ae31a54106de161e994dbf6ce9fc4c /lib/DotNetOpenAuth.BuildTasks.dll | |
| parent | 982a8ac73e6fa9f178a0fb15d9e04c91515c3e49 (diff) | |
| parent | 09398b5febaef7834f2dc822161dc73995439c7e (diff) | |
| download | DotNetOpenAuth-66e2b799c300cd6af3a42d4c4b297718a9f79f04.zip DotNetOpenAuth-66e2b799c300cd6af3a42d4c4b297718a9f79f04.tar.gz DotNetOpenAuth-66e2b799c300cd6af3a42d4c4b297718a9f79f04.tar.bz2 | |
Merge branch 'v3.3' into v3.4
Conflicts:
lib/DotNetOpenAuth.BuildTasks.dll
lib/DotNetOpenAuth.BuildTasks.pdb
Diffstat (limited to 'lib/DotNetOpenAuth.BuildTasks.dll')
| -rw-r--r-- | lib/DotNetOpenAuth.BuildTasks.dll | bin | 71680 -> 71680 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/lib/DotNetOpenAuth.BuildTasks.dll b/lib/DotNetOpenAuth.BuildTasks.dll Binary files differindex 7882acc..260289d 100644 --- a/lib/DotNetOpenAuth.BuildTasks.dll +++ b/lib/DotNetOpenAuth.BuildTasks.dll |