Changeset 7268 for branches/HeuristicLab.TimeSeries/HeuristicLab.Clients.Hive.JobManager/3.3/HeuristicLab.Clients.Hive.JobManager-3.3.csproj

Timestamp:

01/03/12 11:22:21 (13 years ago)

Author:

gkronber

Message:

#1081: merged r7214:7266 from trunk into time series branch.

Location:

branches/HeuristicLab.TimeSeries

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive.JobManager/3.3 (modified) (1 prop)
• HeuristicLab.Clients.Hive.JobManager/3.3/HeuristicLab.Clients.Hive.JobManager-3.3.csproj (modified) (1 diff)

branches/HeuristicLab.TimeSeries/HeuristicLab.Clients.Hive.JobManager/3.3

@@ -1 +1 @@
 Plugin.cs
 obj
+*.vs10x

@@ -1 +1 @@
 Plugin.cs
 obj
+*.vs10x

branches/HeuristicLab.TimeSeries/HeuristicLab.Clients.Hive.JobManager/3.3/HeuristicLab.Clients.Hive.JobManager-3.3.csproj

@@ -136 +136 @@
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Views\HiveJobManagerView.resx">
-      <DependentUpon>HiveJobManagerView.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Views\HiveJobPermissionView.resx">
-      <DependentUpon>HiveJobPermissionView.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Views\RefreshableHiveJobView.resx">
-      <DependentUpon>RefreshableHiveJobView.cs</DependentUpon>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
     <ProjectReference Include="..\..\HeuristicLab.Clients.Hive.Views\3.3\HeuristicLab.Clients.Hive.Views-3.3.csproj">
       <Project>{E1D6C801-892A-406A-B606-F158E36DD3C3}</Project>

@@ -1 +1 @@
 Plugin.cs
 obj
+*.vs10x