summaryrefslogtreecommitdiffstats
path: root/src/DotNetOpenAuth.OAuth2.ResourceServer/OAuth2/ResourceServerStrings.Designer.cs
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v4.0'Andrew Arnott2012-04-051-0/+18
| | | | | | | Conflicts: src/DotNetOpenAuth.OAuth2.Client/DotNetOpenAuth.OAuth2.Client.csproj src/DotNetOpenAuth.OAuth2.ResourceServer/DotNetOpenAuth.OAuth2.ResourceServer.csproj src/DotNetOpenAuth.OAuth2.ResourceServer/OAuth2/ResourceServer.cs
* Fixed peverify errors in unified assembly due to two resources sharing a ↵Andrew Arnott2012-04-051-0/+81
common manifest name. Related to #112 which reported peverify errors, but this is very unlikely to fix the VerificationException.