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

Merge remote-tracking branch 'remotes/origin/lua' into general-devel

Browse source 
Conflicts:
	TShockAPI/Properties/AssemblyInfo.cs
This commit is contained in:
Lucas Nicodemus 2012-01-06 17:26:58 -07:00
commit 04b68eeb94
11 changed files with 267 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TShockAPI/Properties/AssemblyInfo.cs
View file

@ -49,4 +49,4 @@ using System.Runtime.InteropServices;
// MMdd of the build
[assembly: AssemblyVersion("3.4.5.0106")]
[assembly: AssemblyFileVersion("3.4.5.0106")]
[assembly: AssemblyFileVersion("3.4.5.0106")]