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

Merging old release back into the release branch.

Browse source 
Merge branch 'general-devel'
Conflicts:
	TShockAPI/Properties/AssemblyInfo.cs
This commit is contained in:
Lucas Nicodemus 2011-12-04 19:36:01 -07:00
commit 36092d4aa8
38 changed files with 7493 additions and 338 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TShockAPI/Properties/AssemblyInfo.cs
View file

@ -36,5 +36,5 @@ using System.Runtime.InteropServices;
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("3.3.0.0905")]
[assembly: AssemblyFileVersion("3.3.0.0905")]
[assembly: AssemblyVersion("3.3.4.0926")]
[assembly: AssemblyFileVersion("3.3.4.0926")]