Merge for 1.2.4 #8
@ -18,8 +18,8 @@ namespace OWTrack
|
||||
InitializeComponent();
|
||||
loadSave();
|
||||
checkStatus();
|
||||
label4.Text = Program.Version.ToString();
|
||||
Text = "OWTrack " + Program.Version.ToString();
|
||||
label4.Text = Program.version.ToString();
|
||||
Text = "OWTrack " + Program.version.ToString();
|
||||
}
|
||||
|
||||
private void checkStatus()
|
||||
|
@ -22,14 +22,6 @@ namespace OWTrack
|
||||
Application.SetCompatibleTextRenderingDefault(false);
|
||||
Application.Run(new Form1());
|
||||
}
|
||||
private static Version version = new Version(Application.ProductVersion);
|
||||
|
||||
public static Version Version
|
||||
{
|
||||
get
|
||||
{
|
||||
return version;
|
||||
}
|
||||
}
|
||||
public static Version version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
|
||||
}
|
||||
}
|
||||
|
@ -35,7 +35,8 @@ using System.Runtime.InteropServices;
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
//[assembly: AssemblyVersion("1.0.0.0")]
|
||||
//[assembly: AssemblyFileVersion("1.0.0.0")]
|
||||
[assembly: AssemblyVersion("2.0.*")]
|
||||
[assembly: AssemblyFileVersion("1.0.*")]
|
||||
[assembly: NeutralResourcesLanguage("")]
|
||||
[assembly: AssemblyVersion("1.2.3")]
|
||||
[assembly: AssemblyFileVersion("1.2.3")]
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user