diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2010-12-23 13:09:32 -0800 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2010-12-23 13:09:32 -0800 |
| commit | 45775797c5f50dc56370c75c3244ea0e83ab4832 (patch) | |
| tree | 92b067e463370751e7c35ad626062b9d641842fc /src/DotNetOpenAuth.BuildTasks/TaskStrings.Designer.cs | |
| parent | 5c38b4c0564f75a845678005c474df2073113ce7 (diff) | |
| parent | 1b87e9b8d74afe71b70d842ee435523e7f1aad46 (diff) | |
| download | DotNetOpenAuth-45775797c5f50dc56370c75c3244ea0e83ab4832.zip DotNetOpenAuth-45775797c5f50dc56370c75c3244ea0e83ab4832.tar.gz DotNetOpenAuth-45775797c5f50dc56370c75c3244ea0e83ab4832.tar.bz2 | |
Merge branch 'v3.4' into oauth2
Conflicts:
samples/OAuthServiceProvider/Code/DatabaseTokenManager.cs
samples/OAuthServiceProvider/Code/OAuthToken.cs
src/DotNetOpenAuth/Messaging/MessagingStrings.resx
Diffstat (limited to 'src/DotNetOpenAuth.BuildTasks/TaskStrings.Designer.cs')
| -rw-r--r-- | src/DotNetOpenAuth.BuildTasks/TaskStrings.Designer.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/DotNetOpenAuth.BuildTasks/TaskStrings.Designer.cs b/src/DotNetOpenAuth.BuildTasks/TaskStrings.Designer.cs index 17647fd..d5a80a4 100644 --- a/src/DotNetOpenAuth.BuildTasks/TaskStrings.Designer.cs +++ b/src/DotNetOpenAuth.BuildTasks/TaskStrings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // <auto-generated> // This code was generated by a tool. -// Runtime Version:2.0.50727.4927 +// Runtime Version:4.0.30319.1 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -19,7 +19,7 @@ namespace DotNetOpenAuth.BuildTasks { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class TaskStrings { |