Skip to content

Commit

Permalink
Merge branch 'updatesForV2' (#45)
Browse files Browse the repository at this point in the history
  • Loading branch information
rpottsoh committed Jul 22, 2018
2 parents db85eb3 + 9a7769d commit cd6c362
Show file tree
Hide file tree
Showing 5 changed files with 6,165 additions and 5 deletions.
6 changes: 5 additions & 1 deletion Delphi/Project/ExercismCLIInstaller.dproj
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,12 @@
<AppEnableHighDPI>true</AppEnableHighDPI>
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
<DCC_ExeOutput>Win32\Release</DCC_ExeOutput>
<VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
<VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.5.1.2;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.5.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
<DCC_DcuOutput>Win32\Release</DCC_DcuOutput>
<VerInfo_MinorVer>5</VerInfo_MinorVer>
<VerInfo_Release>1</VerInfo_Release>
<VerInfo_AutoIncVersion>true</VerInfo_AutoIncVersion>
<VerInfo_Build>2</VerInfo_Build>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2)'!=''">
<DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
Expand Down
6 changes: 3 additions & 3 deletions Delphi/Project/Source/uClientDownloadFrm.dfm
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,9 @@ object frmDownload: TfrmDownload
Top = 32
Width = 125
Height = 18
Hint = 'https://github.com/exercism/docs'
Hint = 'http://cli.exercism.io'
Caption = 'CLI Documentation'
URL = 'https://github.com/exercism/docs'
URL = 'http://cli.exercism.io'
UseVisitedColor = True
Font.Charset = DEFAULT_CHARSET
Font.Color = clWhite
Expand Down Expand Up @@ -6283,7 +6283,6 @@ object frmDownload: TfrmDownload
FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
FFFF}
Stretch = True
Visible = False
end
end
object btnCancel: TButton
Expand All @@ -6294,6 +6293,7 @@ object frmDownload: TfrmDownload
Caption = '&Cancel'
Enabled = False
TabOrder = 1
Visible = False
OnClick = btnCancelClick
end
object mStatus: TMemo
Expand Down
2 changes: 1 addition & 1 deletion Delphi/Project/Source/uClientDownloadFrm.pas
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{_define V3Test}
{$define V3Test}
unit uClientDownloadFrm;

interface
Expand Down
Loading

0 comments on commit cd6c362

Please sign in to comment.