AriasCreations/LSLEditor
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Ima Mechanique 2012-11-26 20:55:58 +00:00
commit 3ad442128b
2 changed files with 139 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

24
trunk/Properties/Settings.Designer.cs generated
View file

@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.261
// Runtime Version:4.0.30319.296
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@ -1204,7 +1204,7 @@ namespace LSLEditor.Properties {
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("http://a-w-d.dyndns.org:8080/lsleditor/check4update.php")]
[global::System.Configuration.DefaultSettingValueAttribute("http://lsleditor.sourceforge.net/check4update.php")]
public string Update {
get {
return ((string)(this["Update"]));
@ -1213,11 +1213,29 @@ namespace LSLEditor.Properties {
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("http://a-w-d.dyndns.org:8080/lsleditor/update.php")]
[global::System.Configuration.DefaultSettingValueAttribute("http://lsleditor.sourceforge.net/update.php")]
public string UpdateManifest {
get {
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"]));
}
}
}
}

9
trunk/Properties/Settings.settings
View file

@ -323,11 +323,20 @@
<Setting Name="OutputFormat" Type="System.String" Scope="User">
<Value Profile="(Default)">UTF-8</Value>
</Setting>
#ifndef DEBUG
<Setting Name="Update" Type="System.String" Scope="Application">
<Value Profile="(Default)">http://lsleditor.sourceforge.net/check4update.php</Value>
</Setting>
<Setting Name="UpdateManifest" Type="System.String" Scope="Application">
<Value Profile="(Default)">http://lsleditor.sourceforge.net/update.php</Value>
</Setting>
#elseif
<Setting Name="Update" Type="System.String" Scope="Application">
<Value Profile="(Default)">http://a-w-d.dyndns.org:8080/lsleditor/check4update.php</Value>
</Setting>
<Setting Name="UpdateManifest" Type="System.String" Scope="Application">
<Value Profile="(Default)">http://a-w-d.dyndns.org:8080/lsleditor/update.php</Value>
</Setting>
#endif
</Settings>
</SettingsFile>