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

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

Browse source 
Conflicts:
	TShockAPI/Properties/AssemblyInfo.cs
	TShockAPI/TShockAPI.csproj
This commit is contained in:
Lucas Nicodemus 2011-09-02 23:23:23 -06:00
commit b31a84cdd2
3 changed files with 189 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
TShockAPI/Properties/AssemblyInfo.cs
View file

@ -36,10 +36,5 @@ using System.Runtime.InteropServices;
// [assembly: AssemblyVersion("1.0.*")]
<<<<<<< HEAD
[assembly: AssemblyVersion("3.2.8.0903")]
[assembly: AssemblyFileVersion("3.2.8.0903")]
=======
[assembly: AssemblyVersion("3.2.8.0830")]
[assembly: AssemblyFileVersion("3.2.8.0830")]
>>>>>>> remotes/origin/general-devel-mono