Skip to content

Commit

Permalink
Merge pull request #22 from sillypears/master
Browse files Browse the repository at this point in the history
Yes new good
  • Loading branch information
sillypears authored Apr 4, 2021
2 parents e090a8e + 53947b5 commit 0562dc6
Show file tree
Hide file tree
Showing 16 changed files with 1,106,964 additions and 403 deletions.
12 changes: 6 additions & 6 deletions MacSG/MacSG.vbproj
Original file line number Diff line number Diff line change
Expand Up @@ -152,13 +152,13 @@
<Import Include="System.Threading.Tasks" />
</ItemGroup>
<ItemGroup>
<Compile Include="ApplicationEvents.vb" />
<Compile Include="frmConfigure.Designer.vb">
<DependentUpon>frmConfigure.vb</DependentUpon>
<Compile Include="frmAbout.Designer.vb">
<DependentUpon>frmAbout.vb</DependentUpon>
</Compile>
<Compile Include="frmConfigure.vb">
<Compile Include="frmAbout.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="ApplicationEvents.vb" />
<Compile Include="frmMain.vb">
<SubType>Form</SubType>
</Compile>
Expand Down Expand Up @@ -189,8 +189,8 @@
</Compile>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="frmConfigure.resx">
<DependentUpon>frmConfigure.vb</DependentUpon>
<EmbeddedResource Include="frmAbout.resx">
<DependentUpon>frmAbout.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="frmMain.resx">
<DependentUpon>frmMain.vb</DependentUpon>
Expand Down
8 changes: 4 additions & 4 deletions MacSG/My Project/AssemblyInfo.vb
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ Imports System.Runtime.InteropServices
' Review the values of the assembly attributes

<Assembly: AssemblyTitle("MacSG")>
<Assembly: AssemblyDescription("A Streamlink GUI for manging tournament captures")>
<Assembly: AssemblyDescription("A Streamlink GUI for manging tournament captures.")>
<Assembly: AssemblyCompany("CoNDOR")>
<Assembly: AssemblyProduct("MacSG")>
<Assembly: AssemblyCopyright("")>
<Assembly: AssemblyTrademark("")>
<Assembly: AssemblyCopyright("This is a copyright message")>
<Assembly: AssemblyTrademark("This is a trademark message")>

<Assembly: ComVisible(False)>

Expand All @@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("0.9.3.7")>
<Assembly: AssemblyVersion("0.9.3.8")>
178 changes: 178 additions & 0 deletions MacSG/frmAbout.Designer.vb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 0562dc6

Please sign in to comment.