diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2009-10-28 16:44:31 -0700 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2009-10-28 16:44:31 -0700 |
| commit | db7e0aab2eb3a202c086682312d4e191f8179b27 (patch) | |
| tree | cf753f3c3054de82197cd70edd878369069c43dc /tools/Sandcastle/Source/BuildAssembler/BuildComponents/SyntaxComponent.cs | |
| parent | 5ade84d92b8ae3c09a88f601127b65d6bb1b5c03 (diff) | |
| parent | 07a8ecbc4fc50d11179f7e0b3fadb9f2be430ae5 (diff) | |
| download | DotNetOpenAuth-db7e0aab2eb3a202c086682312d4e191f8179b27.zip DotNetOpenAuth-db7e0aab2eb3a202c086682312d4e191f8179b27.tar.gz DotNetOpenAuth-db7e0aab2eb3a202c086682312d4e191f8179b27.tar.bz2 | |
Merge branch 'master' into contracts
Conflicts:
src/DotNetOpenAuth.vsmdi
src/DotNetOpenAuth/GlobalSuppressions.cs
src/DotNetOpenAuth/InfoCard/Token/TokenUtility.cs
src/DotNetOpenAuth/Messaging/MessagingStrings.resx
src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdAjaxTextBox.cs
src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdRelyingPartyControlBase.cs
Diffstat (limited to 'tools/Sandcastle/Source/BuildAssembler/BuildComponents/SyntaxComponent.cs')
0 files changed, 0 insertions, 0 deletions