Merge branch 'dev-next' into dev-syntax-code

This commit is contained in:
Ima Mechanique 2012-11-28 22:21:26 +00:00
commit ac4d11de87
2 changed files with 2 additions and 20 deletions

View file

@ -70,7 +70,7 @@ 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:
[assembly: AssemblyVersion("2.47.1.7")]
[assembly: AssemblyVersion("2.47.1.9")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
@ -100,4 +100,4 @@ using System.Runtime.InteropServices;
[assembly: AssemblyDelaySign(false)]
//[assembly: AssemblyKeyName("")]
[assembly: ComVisibleAttribute(false)]
[assembly: AssemblyFileVersionAttribute("2.47.1.7")]
[assembly: AssemblyFileVersionAttribute("2.47.1.9")]

View file

@ -1219,23 +1219,5 @@ namespace LSLEditor.Properties {
return ((string)(this["UpdateManifest"]));
}
}
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("http://a-w-d.dyndns.org:8080/lsleditor/check4update.php")]
public string Update1 {
get {
return ((string)(this["Update1"]));
}
}
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("http://a-w-d.dyndns.org:8080/lsleditor/update.php")]
public string UpdateManifest1 {
get {
return ((string)(this["UpdateManifest1"]));
}
}
}
}