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

Stuff

Browse source
This commit is contained in:
Lucas Nicodemus 2011-09-02 23:21:01 -06:00
parent b0f5a49ec2
commit 442a5b4202
15 changed files with 74 additions and 255 deletions
Download patch file Download diff file Expand all files Collapse all files

5
TShockAPI/Properties/AssemblyInfo.cs
View file

@ -36,5 +36,10 @@ 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