Merge branch 'release/2.1.2.0'

wcm-io-devops · Mar 9, 2016 · 868bc6a · 868bc6a
2 parents b242dea + 0b8cda9
commit 868bc6a
Show file tree

Hide file tree

Showing 30 changed files with 124 additions and 225 deletions.
diff --git a/AEMManager/AEMManager.csproj b/AEMManager/AEMManager.csproj
@@ -179,6 +179,7 @@
     <Content Include="icons\aem.ico">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <None Include="resources\wcmio-logo.png" />
     <EmbeddedResource Include="resources\iconset_inv_num\0.ico" />
     <EmbeddedResource Include="resources\iconset_inv_num\1.ico" />
     <EmbeddedResource Include="resources\iconset_inv_num\2.ico" />

diff --git a/AEMManager/InfoDialog.Designer.cs b/AEMManager/InfoDialog.Designer.cs
diff --git a/AEMManager/InfoDialog.cs b/AEMManager/InfoDialog.cs
@@ -37,6 +37,7 @@ private void lblLicenseLink_LinkClicked(object sender, LinkLabelLinkClickedEvent
       p.StartInfo.FileName = "http://www.apache.org/licenses/LICENSE-2.0";
       p.Start();
     }
+
   }
 
 }
-Original file line number
+Diff line change
@@ Expand Up @@
           p.StartInfo.FileName = "http://www.apache.org/licenses/LICENSE-2.0";
           p.Start();
         }
       }
     }