diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2010-01-12 09:05:33 -0800 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2010-01-12 09:05:33 -0800 |
| commit | 531bac5ee81947b05a3b2d0ca1b170838c6bd1b6 (patch) | |
| tree | 385c3a754bc78826c74b1ea00feee6c65d6f4c2e /src/DotNetOpenAuth.BuildTasks/AddProjectItems.cs | |
| parent | 85d2b2d6c6a9df11b843911e64fa28662a71702e (diff) | |
| parent | 3798d0a67e9fb5b5ebdb431b686c5fc2f21e2b7c (diff) | |
| download | DotNetOpenAuth-531bac5ee81947b05a3b2d0ca1b170838c6bd1b6.zip DotNetOpenAuth-531bac5ee81947b05a3b2d0ca1b170838c6bd1b6.tar.gz DotNetOpenAuth-531bac5ee81947b05a3b2d0ca1b170838c6bd1b6.tar.bz2 | |
Merge branch 'v3.1' into v3.2
Conflicts:
src/DotNetOpenAuth/GlobalSuppressions.cs
Diffstat (limited to 'src/DotNetOpenAuth.BuildTasks/AddProjectItems.cs')
0 files changed, 0 insertions, 0 deletions