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/Properties/AssemblyInfo.cs
This commit is contained in:
high 2011-07-23 00:51:14 -04:00
commit 78c7293542
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TShockAPI/Properties/AssemblyInfo.cs
View file

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