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

Merge branch 'master' of github.com:TShock/TShock

Browse source 
Conflicts:
	TShockAPI/TShock.cs
This commit is contained in:
high 2011-06-08 10:37:53 -04:00
commit 1067c22857
1 changed files with 0 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Update/Update.csproj
View file

@ -59,7 +59,6 @@
<SubType>Designer</SubType> <SubType>Designer</SubType>
</EmbeddedResource> </EmbeddedResource>
</ItemGroup> </ItemGroup>
<ItemGroup />
<ItemGroup> <ItemGroup>
<Content Include="Resources\TShockAPI.dll" /> <Content Include="Resources\TShockAPI.dll" />
</ItemGroup> </ItemGroup>