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

Merge branch 'general-devel'

Browse source 
Conflicts:
	TShockAPI/Properties/AssemblyInfo.cs
	TShockAPI/Utils.cs
This commit is contained in:
Lucas Nicodemus 2011-12-21 11:40:18 -07:00
commit b22534efd3
40 changed files with 2169 additions and 788 deletions
Download patch file Download diff file Expand all files Collapse all files

5
TShockAPI/Properties/AssemblyInfo.cs
View file

@ -35,6 +35,5 @@ using System.Runtime.InteropServices;
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("3.3.4.0926")]
[assembly: AssemblyFileVersion("3.3.4.0926")]
[assembly: AssemblyVersion("3.4.0.1221")]
[assembly: AssemblyFileVersion("3.4.0.1221")]