diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2009-12-28 08:18:35 -0800 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2009-12-28 08:18:35 -0800 |
| commit | d855f2c295e0bbb7a3b73f8dfc933a539c2a2efe (patch) | |
| tree | 6d309115c206711a6e6a7bba33ac45a7eaddf9f7 /src/DotNetOpenId.BuildTasks/DotNetOpenId.BuildTasks.csproj | |
| parent | 66f7179ed6fa8bc8bcd7e831ebb8ac4548067d85 (diff) | |
| parent | 360a625667a5e3fcb169710dd35536fc32df8759 (diff) | |
| download | DotNetOpenAuth-origin/v2.6.zip DotNetOpenAuth-origin/v2.6.tar.gz DotNetOpenAuth-origin/v2.6.tar.bz2 | |
Merge branch 'v2.5' into v2.6origin/v2.6
Conflicts:
src/version.txt
Diffstat (limited to 'src/DotNetOpenId.BuildTasks/DotNetOpenId.BuildTasks.csproj')
0 files changed, 0 insertions, 0 deletions