Context Navigation

HeuristicLab.MainForm.WindowsForms-3.3.csproj

Timestamp:

07/03/12 16:46:35 (12 years ago)

Author:

gkronber

Message:

#1847: merged r8084:8205 from trunk into GP move operators branch

Location:

branches/GP-MoveOperators

Files:

branches/GP-MoveOperators
- Property svn:mergeinfo changed
  /trunk/sources merged: 8084,8088-8090,8092-8100,8102-8113,8115,8117-8132,8134-8146,8148-8156,8158-8160,8163-8170,8173-8176,8178-8190,8192-8205

-                      r7582
+                      r8206
     </Compile>
     <Compile Include="ToolBarItem.cs" />
     <Compile Include="Views\ProgressView.cs">
       <SubType>UserControl</SubType>
     </Compile>
     <Compile Include="Views\ProgressView.designer.cs">
+    <Compile Include="Controls\ProgressView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Controls\ProgressView.designer.cs">
       <DependentUpon>ProgressView.cs</DependentUpon>
     </Compile>

Note: See TracChangeset for help on using the changeset viewer.