Public Git Hosting - dotnetoauth.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: b91d5c4 2af0f65)

commit	fb5b3770a76d71b3b0968c5bcf24a9fdb3bd2016
author	Andrew Arnott <andrewarnott@gmail.com>
	Wed, 14 Jan 2009 01:43:54 +0000 (13 17:43 -0800)
committer	Andrew <andrewarnott@gmail.com>
	Wed, 14 Jan 2009 01:43:54 +0000 (13 17:43 -0800)
tree	2b51057e633388d11b2d7e0a1d9d08056faba906	tree \| snapshot (tar.gz zip)
parent	b91d5c485e4d6cdbd5048228dd9c8fd7119274c1	commit \| diff
parent	2af0f6562669e87664272254f0c7ea06d7ef15f0	commit \| diff

Merge branch 'oauthrsa'

Conflicts:

src/DotNetOpenAuth/DotNetOpenAuth.csproj
src/DotNetOpenAuth/OAuth/ChannelElements/SigningBindingElementBase.cs

src/DotNetOpenAuth/DotNetOpenAuth.csproj	diff1 \|	diff2 \|	blob \| history
src/DotNetOpenAuth/OAuth/ChannelElements/SigningBindingElementBase.cs	diff1 \|	diff2 \|	blob \| history

OAuth running on .NET