themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge branch 'general-devel-rest' of github.com:TShock/TShock into general-devel-rest

Browse source
This commit is contained in:
high 2011-09-05 14:12:59 -04:00
commit b7fd7f1953
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

0
TShockAPI/Rest.cs → TShockAPI/Rest/Rest.cs
View file

0
TShockAPI/RestManager.cs → TShockAPI/Rest/RestManager.cs
View file

0
TShockAPI/SecureRest.cs → TShockAPI/Rest/SecureRest.cs
View file

8
TShockAPI/TShockAPI.csproj
View file

@ -124,9 +124,9 @@
<DesignTime>True</DesignTime> <DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon> <DependentUpon>Resources.resx</DependentUpon>
</Compile> </Compile>
<Compile Include="Rest.cs" /> <Compile Include="Rest\Rest.cs" />
<Compile Include="RestManager.cs" /> <Compile Include="Rest\RestManager.cs" />
<Compile Include="SecureRest.cs" /> <Compile Include="Rest\SecureRest.cs" />
<Compile Include="Tools.cs" /> <Compile Include="Tools.cs" />
<Compile Include="TShock.cs" /> <Compile Include="TShock.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
@ -183,7 +183,7 @@
</PropertyGroup> </PropertyGroup>
<ProjectExtensions> <ProjectExtensions>
<VisualStudio> <VisualStudio>
<UserProperties BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UpdateFileVersion="True" BuildVersion_BuildAction="Both" BuildVersion_BuildVersioningStyle="None.None.None.MonthAndDayStamp" BuildVersion_StartDate="2011/6/17" BuildVersion_IncrementBeforeBuild="False" /> <UserProperties BuildVersion_IncrementBeforeBuild="False" BuildVersion_StartDate="2011/6/17" BuildVersion_BuildVersioningStyle="None.None.None.MonthAndDayStamp" BuildVersion_BuildAction="Both" BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" />
</VisualStudio> </VisualStudio>
</ProjectExtensions> </ProjectExtensions>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.