diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2011-06-26 19:55:28 -0700 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2011-06-26 19:55:28 -0700 |
| commit | 1498e4d316838850cbfc40628c70b20b108e340b (patch) | |
| tree | 1ef7695d44e2ec2e491d6d9370b41dcd03a9dc4b /samples/OAuthClient/OAuthClient.csproj | |
| parent | 37f71488eba9e010ae7c3a8b4839caeb905dcf58 (diff) | |
| parent | 9428480e11968a3df460cf7192f43b9d7cfc6ce4 (diff) | |
| download | DotNetOpenAuth-1498e4d316838850cbfc40628c70b20b108e340b.zip DotNetOpenAuth-1498e4d316838850cbfc40628c70b20b108e340b.tar.gz DotNetOpenAuth-1498e4d316838850cbfc40628c70b20b108e340b.tar.bz2 | |
Merge branch 'v3.4'
Conflicts:
samples/OAuthClient/OAuthClient.csproj
Diffstat (limited to 'samples/OAuthClient/OAuthClient.csproj')
| -rw-r--r-- | samples/OAuthClient/OAuthClient.csproj | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/samples/OAuthClient/OAuthClient.csproj b/samples/OAuthClient/OAuthClient.csproj index 629a3d8..7745c24 100644 --- a/samples/OAuthClient/OAuthClient.csproj +++ b/samples/OAuthClient/OAuthClient.csproj @@ -62,6 +62,7 @@ <Content Include="favicon.ico" /> <Content Include="Global.asax" /> <Content Include="GoogleAddressBook.aspx" /> + <Content Include="GoogleApps2Legged.aspx" /> <Content Include="images\Sign-in-with-Twitter-darker.png" /> <Content Include="SampleWcf2Javascript.html" /> <Content Include="SampleWcf2Javascript.js" /> @@ -106,8 +107,14 @@ </Compile> <Compile Include="SampleWcf2.aspx.cs"> <DependentUpon>SampleWcf2.aspx</DependentUpon> + </Compile> + <Compile Include="GoogleApps2Legged.aspx.cs"> + <DependentUpon>GoogleApps2Legged.aspx</DependentUpon> <SubType>ASPXCodeBehind</SubType> </Compile> + <Compile Include="GoogleApps2Legged.aspx.designer.cs"> + <DependentUpon>GoogleApps2Legged.aspx</DependentUpon> + </Compile> <Compile Include="SampleWcf2.aspx.designer.cs"> <DependentUpon>SampleWcf2.aspx</DependentUpon> </Compile> |