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

trunk/Properties/Settings.Designer.cs

@@ -1204,7 +1204,7 @@ namespace LSLEditor.Properties {
         
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-		[global::System.Configuration.DefaultSettingValueAttribute("http://lsleditor.sourceforge.net/check4update.php")]
+        [global::System.Configuration.DefaultSettingValueAttribute("http://a-w-d.dyndns.org:8080/lsleditor/check4update.php")]
         public string Update {
             get {
                 return ((string)(this["Update"]));
@@ -1213,7 +1213,7 @@ namespace LSLEditor.Properties {
         
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-		[global::System.Configuration.DefaultSettingValueAttribute("http://lsleditor.sourceforge.net/update.php")]
+        [global::System.Configuration.DefaultSettingValueAttribute("http://a-w-d.dyndns.org:8080/lsleditor/update.php")]
         public string UpdateManifest {
             get {
                 return ((string)(this["UpdateManifest"]));

trunk/Web References/org.lsleditor.www/Reference.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.225
+//     Runtime Version:4.0.30319.261
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -9,7 +9,7 @@
 //------------------------------------------------------------------------------
 
 // 
-// This source code was auto-generated by Microsoft.VSDesigner, Version 4.0.30319.225.
+// This source code was auto-generated by Microsoft.VSDesigner, Version 4.0.30319.261.
 // 
 #pragma warning disable 1591
 

trunk/app.config

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version="1.0"?>
 <configuration>
   <configSections>
     <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -320,4 +319,4 @@
       </setting>
     </LSLEditor.Properties.Settings>
   </applicationSettings>
-</configuration>
+<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>

trunk/lsleditor.csproj

@@ -43,7 +43,8 @@
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>..\bin\Debug\</OutputPath>