Changeset 8331 for branches/ScatterSearch (trunk integration)/HeuristicLab.CodeEditor

Timestamp:

07/26/12 09:51:13 (12 years ago)

Author:

jkarder

Message:

#1331: merged r8086:8330 from trunk

Location:

branches/ScatterSearch (trunk integration)

Files:

• . (modified) (2 props)
• HeuristicLab.CodeEditor/3.3/CodeCompletionProvider.cs (modified) (1 diff)
• HeuristicLab.CodeEditor/3.3/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.CodeEditor/3.3/Properties/AssemblyInfo.cs.frame (modified) (1 diff)

branches/ScatterSearch (trunk integration)

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll

branches/ScatterSearch (trunk integration)/HeuristicLab.CodeEditor/3.3/CodeCompletionProvider.cs

@@ -97 +97 @@
             AddCompletionData(resultList, completionData);
           }
-        } catch (NullReferenceException x) { }
+        }
+        catch (NullReferenceException) { }
       }
       return resultList.ToArray();

branches/ScatterSearch (trunk integration)/HeuristicLab.CodeEditor/3.3/Plugin.cs.frame

@@ -27 +27 @@
 
 namespace HeuristicLab.CodeEditor {
-  [Plugin("HeuristicLab.CodeEditor", "3.3.6.$WCREV$")]
+  [Plugin("HeuristicLab.CodeEditor", "3.3.7.$WCREV$")]
   [PluginFile("HeuristicLab.CodeEditor-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Common.Resources", "3.3")]

branches/ScatterSearch (trunk integration)/HeuristicLab.CodeEditor/3.3/Properties/AssemblyInfo.cs.frame

@@ -51 +51 @@
 //
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.6.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.7.$WCREV$")]

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll