diff options
author | Andrew Arnott <andrewarnott@gmail.com> | 2009-12-28 08:21:53 -0800 |
---|---|---|
committer | Andrew Arnott <andrewarnott@gmail.com> | 2009-12-28 08:21:53 -0800 |
commit | d1885bf686ab8814f35a2d79a34692cf18ca477e (patch) | |
tree | 5154700f334635e3f41921361d71ef8699e34ebf /src/DotNetOpenAuth.BuildTasks/GetBuildVersion.cs | |
parent | 2545f8505692c35bc93150c506d3493039db86df (diff) | |
parent | 2a9c800e1ff12e31440ae1e8f020d67f2a49dc1c (diff) | |
download | DotNetOpenAuth-d1885bf686ab8814f35a2d79a34692cf18ca477e.zip DotNetOpenAuth-d1885bf686ab8814f35a2d79a34692cf18ca477e.tar.gz DotNetOpenAuth-d1885bf686ab8814f35a2d79a34692cf18ca477e.tar.bz2 |
Merge branch 'v3.2' into v3.3
Conflicts:
tools/DotNetOpenAuth.Versioning.targets
Diffstat (limited to 'src/DotNetOpenAuth.BuildTasks/GetBuildVersion.cs')
0 files changed, 0 insertions, 0 deletions