Merge branch 'general-devel-rest' of github.com:TShock/TShock into general-devel-rest

Conflicts:
	TShockAPI/TShock.cs
This commit is contained in:
high 2011-09-05 01:14:24 -04:00
commit 595efa4d41
4 changed files with 60 additions and 24 deletions

View file

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