Skip to content

Commit

Permalink
Merge branch 'release/4.13.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
DelphiDabbler committed Feb 20, 2016
2 parents 5dcaf28 + 25035b4 commit 588e9f3
Show file tree
Hide file tree
Showing 27 changed files with 228 additions and 168 deletions.
17 changes: 17 additions & 0 deletions .gitignore
@@ -0,0 +1,17 @@
# .gitignore file for CodeSnip project

# Delphi generated temporary files and directories
*.local
*.identcache
*.projdata
*.tvsconfig
*.dsk
*.~*
__history/

# Project specific directories & files
Bin
Exe
Release
Src/CodeSnip.cfg
Src/AutoGen/IntfExternalObj.pas
9 changes: 8 additions & 1 deletion Docs/ChangeLogs/ChangeLog-v4.txt
Expand Up @@ -3,14 +3,21 @@
; v. 2.0. If a copy of the MPL was not distributed with this file, You can
; obtain one at http://mozilla.org/MPL/2.0/
;
; Copyright (C) 2012-2015, Peter Johnson (www.delphidabbler.com).
; Copyright (C) 2012-2016, Peter Johnson (www.delphidabbler.com).
;
; $Rev$
; $Date$
;
; Change Log for CodeSnip Release 4
; ------------------------------------------------------------------------------

Release v4.13.2 of 20 February 2016
+ Updated and corrected hints displayed in main window.
+ Changed some menu options and associated dialogue box captions.
+ Tweaked some button captions in Select Snippets dialogue box.
+ Updated help file re the menu and caption changes.
+ Updated copyright date in program license as displayed in help, about box, installer and documentation.

Release v4.13.1 of 29 September 2015
+ Improved operating system detection to detect Windows 10.
+ Modified program's manifest to declare it compatible with Windows 8 to 10.
Expand Down
2 changes: 1 addition & 1 deletion Docs/LICENSE
Expand Up @@ -5,4 +5,4 @@ This Source Code Form is subject to the terms of the Mozilla Public
License, v. 2.0. If a copy of the MPL was not distributed with this
file, You can obtain one at http://mozilla.org/MPL/2.0/.

All files are copyright (C) 2012-2015, Peter Johnson (www.delphidabbler.com).
All files are copyright (C) 2012-2016, Peter Johnson (www.delphidabbler.com).
4 changes: 2 additions & 2 deletions Docs/License.html
Expand Up @@ -5,7 +5,7 @@
* v. 2.0. If a copy of the MPL was not distributed with this file, You can
* obtain one at http://mozilla.org/MPL/2.0/
*
* Copyright (C) 2012-2015, Peter Johnson (www.delphidabbler.com).
* Copyright (C) 2012-2016, Peter Johnson (www.delphidabbler.com).
*
* $Rev$
* $Date$
Expand Down Expand Up @@ -228,7 +228,7 @@ <h2>
Executable Program
</h2>
<p>
DelphiDabbler <em>CodeSnip</em> is copyright &copy; 2005-2015 by Peter D
DelphiDabbler <em>CodeSnip</em> is copyright &copy; 2005-2016 by Peter D
Johnson, <a
href="http://www.delphidabbler.com"
>http://www.delphidabbler.com</a>.
Expand Down
2 changes: 2 additions & 0 deletions README.md
Expand Up @@ -22,6 +22,8 @@ CodeSnip is installed and removed using a standard Windows installer. Administra

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.

> 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.
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).

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.
Expand Down
2 changes: 1 addition & 1 deletion Src/Compilers.UBDS.pas
Expand Up @@ -117,7 +117,7 @@ function TBDSCompiler.GetDefaultRTLNamespaces: string;
begin
if not RequiresRTLNamespaces then
Exit('');
Result := 'System Vcl winapi Vcl.Imaging';
Result := 'System Vcl winapi Vcl.Imaging System.Win';
end;

function TBDSCompiler.GetIDString: string;
Expand Down
4 changes: 2 additions & 2 deletions Src/FmFindCompilerDlg.dfm
@@ -1,9 +1,9 @@
inherited FindCompilerDlg: TFindCompilerDlg
Left = 268
Top = 121
Caption = 'Find Compiler'
Caption = 'Find Compiler(s)'
ExplicitWidth = 474
ExplicitHeight = 356
ExplicitHeight = 375
PixelsPerInch = 96
TextHeight = 13
inherited pnlBody: TPanel
Expand Down
2 changes: 1 addition & 1 deletion Src/FmFindCompilerDlg.pas
Expand Up @@ -3,7 +3,7 @@
* v. 2.0. If a copy of the MPL was not distributed with this file, You can
* obtain one at http://mozilla.org/MPL/2.0/
*
* Copyright (C) 2005-2013, Peter Johnson (www.delphidabbler.com).
* Copyright (C) 2005-2016, Peter Johnson (www.delphidabbler.com).
*
* $Rev$
* $Date$
Expand Down

0 comments on commit 588e9f3

Please sign in to comment.