Merge branch 'dev-v3' into dev-v3-audit-style

This commit is contained in:
Ima Mechanique 2013-07-14 03:59:42 +01:00
commit 546be43b01
3 changed files with 6 additions and 7 deletions

Binary file not shown.

View file

@ -1,4 +1,4 @@
// /**
// /**
// ********
// *
// * ORIGINAL CODE BASE IS Copyright (C) 2006-2010 by Alphons van der Heijden
@ -55,7 +55,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("LSL Editor")]
[assembly: AssemblyCopyright("2006 - 2013")]
[assembly: AssemblyCopyright("2006 - 2012")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@ -69,9 +69,8 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
//
// LSL-Editor uses the Major.Minor.Bugfix.Build format.
[assembly: AssemblyVersion("2.999.999.1")]
[assembly: AssemblyVersion("2.999.999.2")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
@ -101,4 +100,4 @@ using System.Runtime.InteropServices;
[assembly: AssemblyDelaySign(false)]
//[assembly: AssemblyKeyName("")]
[assembly: ComVisibleAttribute(false)]
[assembly: AssemblyFileVersionAttribute("2.999.999.1")]
[assembly: AssemblyFileVersionAttribute("2.999.999.2")]

View file

@ -870,6 +870,6 @@
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>"$(FrameworkSDKDir)Bin\rc.exe" /r "$(ProjectDir)$(TargetName).rc"</PreBuildEvent>
<PostBuildEvent>E:\Dev\C#\AssemblyRevisionIncrement\bin\Release\AssemblyRevisionIncrementer.exe /t="$(SolutionDir)\Properties\AssemblyInfo.cs"</PostBuildEvent>
<PostBuildEvent>$(SolutionDir)\..\build\AssemblyRevisionIncrementer.exe /t="$(SolutionDir)\Properties\AssemblyInfo.cs"</PostBuildEvent>
</PropertyGroup>
</Project>