Skip to content

Commit 868bc6a

Browse files
committed
Merge branch 'release/2.1.2.0'
2 parents b242dea + 0b8cda9 commit 868bc6a

30 files changed

+124
-225
lines changed

AEMManager/AEMManager.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@
179179
<Content Include="icons\aem.ico">
180180
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
181181
</Content>
182+
<None Include="resources\wcmio-logo.png" />
182183
<EmbeddedResource Include="resources\iconset_inv_num\0.ico" />
183184
<EmbeddedResource Include="resources\iconset_inv_num\1.ico" />
184185
<EmbeddedResource Include="resources\iconset_inv_num\2.ico" />

AEMManager/InfoDialog.Designer.cs

Lines changed: 31 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

AEMManager/InfoDialog.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ private void lblLicenseLink_LinkClicked(object sender, LinkLabelLinkClickedEvent
3737
p.StartInfo.FileName = "http://www.apache.org/licenses/LICENSE-2.0";
3838
p.Start();
3939
}
40+
4041
}
4142

4243
}

0 commit comments

Comments
 (0)