Skip to content

Commit 588e9f3

Browse files
author
DelphiDabbler
committed
Merge branch 'release/4.13.2'
2 parents 5dcaf28 + 25035b4 commit 588e9f3

27 files changed

+228
-168
lines changed

Diff for: ‎.gitignore

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# .gitignore file for CodeSnip project
2+
3+
# Delphi generated temporary files and directories
4+
*.local
5+
*.identcache
6+
*.projdata
7+
*.tvsconfig
8+
*.dsk
9+
*.~*
10+
__history/
11+
12+
# Project specific directories & files
13+
Bin
14+
Exe
15+
Release
16+
Src/CodeSnip.cfg
17+
Src/AutoGen/IntfExternalObj.pas

Diff for: ‎Docs/ChangeLogs/ChangeLog-v4.txt

+8-1
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,21 @@
33
; v. 2.0. If a copy of the MPL was not distributed with this file, You can
44
; obtain one at http://mozilla.org/MPL/2.0/
55
;
6-
; Copyright (C) 2012-2015, Peter Johnson (www.delphidabbler.com).
6+
; Copyright (C) 2012-2016, Peter Johnson (www.delphidabbler.com).
77
;
88
; $Rev$
99
; $Date$
1010
;
1111
; Change Log for CodeSnip Release 4
1212
; ------------------------------------------------------------------------------
1313

14+
Release v4.13.2 of 20 February 2016
15+
+ Updated and corrected hints displayed in main window.
16+
+ Changed some menu options and associated dialogue box captions.
17+
+ Tweaked some button captions in Select Snippets dialogue box.
18+
+ Updated help file re the menu and caption changes.
19+
+ Updated copyright date in program license as displayed in help, about box, installer and documentation.
20+
1421
Release v4.13.1 of 29 September 2015
1522
+ Improved operating system detection to detect Windows 10.
1623
+ Modified program's manifest to declare it compatible with Windows 8 to 10.

Diff for: ‎Docs/LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ This Source Code Form is subject to the terms of the Mozilla Public
55
License, v. 2.0. If a copy of the MPL was not distributed with this
66
file, You can obtain one at http://mozilla.org/MPL/2.0/.
77

8-
All files are copyright (C) 2012-2015, Peter Johnson (www.delphidabbler.com).
8+
All files are copyright (C) 2012-2016, Peter Johnson (www.delphidabbler.com).

Diff for: ‎Docs/License.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* v. 2.0. If a copy of the MPL was not distributed with this file, You can
66
* obtain one at http://mozilla.org/MPL/2.0/
77
*
8-
* Copyright (C) 2012-2015, Peter Johnson (www.delphidabbler.com).
8+
* Copyright (C) 2012-2016, Peter Johnson (www.delphidabbler.com).
99
*
1010
* $Rev$
1111
* $Date$
@@ -228,7 +228,7 @@ <h2>
228228
Executable Program
229229
</h2>
230230
<p>
231-
DelphiDabbler <em>CodeSnip</em> is copyright &copy; 2005-2015 by Peter D
231+
DelphiDabbler <em>CodeSnip</em> is copyright &copy; 2005-2016 by Peter D
232232
Johnson, <a
233233
href="http://www.delphidabbler.com"
234234
>http://www.delphidabbler.com</a>.

Diff for: ‎README.md

+2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ CodeSnip is installed and removed using a standard Windows installer. Administra
2222

2323
Up to and including release 4.13.1 the project's source code was maintained in a Subversion repository on [SourceForge](https://sourceforge.net/p/codesnip/code/). The Subversion repo was converted to Git on 21 5 October 2015 and imported to GitHub. All releases from v3.0.0 are marked by tags in the form `version-x.x.x` where `x.x.x` is the version number.
2424

25+
> Note that any branches that were created and deleted in the Subversion repo are missing from the Git history. So, for full details of the the project's history from v3.0.0 to v4.13.1 please refer to the old Subversion repo on SourceForge.
26+
2527
Following tag `version-4.13.1` the [Git Flow](http://nvie.com/posts/a-successful-git-branching-model/) methodology was adopted, with the exception that development work on CodeSnip v5 exists outside Git Flow in the `pagoda` and `parsnip` branches (See below for details).
2628

2729
Up to and including release 4.13.1, `master` is simply a copy of the old Subversion `trunk` and, as such, contains various development commits. After release 4.13.1, and the addition of this read-me file, `master` contains only commits relating to an actual release.

Diff for: ‎Src/Compilers.UBDS.pas

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ function TBDSCompiler.GetDefaultRTLNamespaces: string;
117117
begin
118118
if not RequiresRTLNamespaces then
119119
Exit('');
120-
Result := 'System Vcl winapi Vcl.Imaging';
120+
Result := 'System Vcl winapi Vcl.Imaging System.Win';
121121
end;
122122

123123
function TBDSCompiler.GetIDString: string;

Diff for: ‎Src/FmFindCompilerDlg.dfm

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
inherited FindCompilerDlg: TFindCompilerDlg
22
Left = 268
33
Top = 121
4-
Caption = 'Find Compiler'
4+
Caption = 'Find Compiler(s)'
55
ExplicitWidth = 474
6-
ExplicitHeight = 356
6+
ExplicitHeight = 375
77
PixelsPerInch = 96
88
TextHeight = 13
99
inherited pnlBody: TPanel

Diff for: ‎Src/FmFindCompilerDlg.pas

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* v. 2.0. If a copy of the MPL was not distributed with this file, You can
44
* obtain one at http://mozilla.org/MPL/2.0/
55
*
6-
* Copyright (C) 2005-2013, Peter Johnson (www.delphidabbler.com).
6+
* Copyright (C) 2005-2016, Peter Johnson (www.delphidabbler.com).
77
*
88
* $Rev$
99
* $Date$

0 commit comments

Comments
 (0)