diff options
author | Andrew Arnott <andrewarnott@gmail.com> | 2010-01-08 09:13:00 -0800 |
---|---|---|
committer | Andrew Arnott <andrewarnott@gmail.com> | 2010-01-08 09:13:00 -0800 |
commit | 1e74844e63bd444b6848ca526a2c18b4d32e71cb (patch) | |
tree | 0e801d5065957d2441a51ed37141eafdaa5aebff /src/DotNetOpenAuth.BuildTasks/GetBuildVersion.cs | |
parent | 7e774c857642f27c360ffab07cbbf66bf3d08eea (diff) | |
parent | e30890023e669748386a43568cdba120e4d6f058 (diff) | |
download | DotNetOpenAuth-1e74844e63bd444b6848ca526a2c18b4d32e71cb.zip DotNetOpenAuth-1e74844e63bd444b6848ca526a2c18b4d32e71cb.tar.gz DotNetOpenAuth-1e74844e63bd444b6848ca526a2c18b4d32e71cb.tar.bz2 |
Merge branch 'master' into master-Dev10
Conflicts:
samples/OpenIdOfflineProvider/OpenIdOfflineProvider.csproj
src/DotNetOpenAuth.Test/DotNetOpenAuth.Test.csproj
src/DotNetOpenAuth/DotNetOpenAuth.csproj
Diffstat (limited to 'src/DotNetOpenAuth.BuildTasks/GetBuildVersion.cs')
0 files changed, 0 insertions, 0 deletions