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

Merge branch 'master' into general-devel

Browse source 
Conflicts:
	DBEditor/TShockDBEditor.csproj
This commit is contained in:
Lucas Nicodemus 2011-07-23 17:30:20 -06:00
commit 1c7d71431f
33 changed files with 2251 additions and 266 deletions
Download patch file Download diff file Expand all files Collapse all files

1
DBEditor/TShockDBEditor.csproj
View file

@ -14,7 +14,6 @@
<TargetFrameworkProfile>
</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
<IsWebBootstrapper>false</IsWebBootstrapper>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>