Skip to content

Commit 4f9369d

Browse files
author
DelphiDabbler
committed
Merged relevant information from Docs/GUI/SourceCodeLicenses.txt into Docs/SourceCodeLicenses.txt and deleted the former.
1 parent 7470439 commit 4f9369d

File tree

2 files changed

+29
-95
lines changed

2 files changed

+29
-95
lines changed

Docs/GUI/SourceCodeLicenses.txt

Lines changed: 0 additions & 78 deletions
This file was deleted.

Docs/SourceCodeLicenses.txt

Lines changed: 29 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ PASHI SOURCE CODE LICENSING
66

77
This document discusses and presents the relevant licenses governing the PasHi
88
source code as maintained in the PasHi Subversion code repository and provided
9-
for download in compressed archives.
9+
for download in compressed archives. The PasHi source code also includes the
10+
PasHiGUI source.
1011

1112
The source code includes:
1213

@@ -16,31 +17,41 @@ The source code includes:
1617

1718
Please refer to the relevant section below fo details of licensing.
1819

19-
The download does not include all the source code required to rebuild PasHi.
20-
Explicitly it doesn't include:
20+
The download does not include all the source code required to rebuild the PasHi
21+
project. Explicitly it doesn't include:
2122

22-
+ Source files from the Delphi 7 VCL. You must have Delphi in order to access
23+
+ Source files from the Delphi 2006 VCL. You must have Delphi in order to access
2324
these files.
2425
+ DelphiDabbler library units. These are all available from
25-
http://www.delphidabbler.com/software?id=pash&tab=download
26+
http://www.delphidabbler.com/software/pash/download
2627

2728
--------------------------------------------------------------------------------
2829
Original Source Code
2930
--------------------------------------------------------------------------------
3031

3132
Original source files are stored in the the following directories:
3233

33-
Src
34-
Src\Assets
34+
+ Src
35+
+ Src\Assets
36+
+ Src\GUI
37+
+ Src\GUI\Resources
3538

3639
Any original source code file that is governed by a license has a comment to
3740
that effect in the source file.
3841

39-
Any other source code files that contain no copyright or license information are
40-
public domain.
42+
Any other source code files that contain no copyright or license information can
43+
be used without restriction.
4144

42-
Many source code files are licensed under the Mozilla Public License. A full
43-
copy of that license can be found in MPL.txt
45+
Many source code files are licensed under the Mozilla Public License v1.1. A
46+
full copy of that license can be found in MPL.txt in the Docs directory.
47+
48+
--------------------------------------------------------------------------------
49+
3rd Party Source Code
50+
--------------------------------------------------------------------------------
51+
52+
3rd Party source code is stored in the Src\3rdParty directory. At the time of
53+
writing, the only "3rd Party" code is taken from the DelpiDabbler code library
54+
and is released under the Mozilla Public License v1.1
4455

4556
--------------------------------------------------------------------------------
4657
Documentation
@@ -83,14 +94,15 @@ treated as public domain.
8394
Image Files
8495
--------------------------------------------------------------------------------
8596

86-
The only image provided is the program's icon, PasHi.ico. This file is copyright
87-
(C) 2009 Peter Johnson (www.delphidabbler.com).
97+
The only images provided are the icons for PasHi and PasHiGUI: PasHi.ico and
98+
MainIcon.ico respectively. These files are copyright 2006-2010 Peter Johnson
99+
(www.delphidabbler.com).
88100

89-
The file may not be altered in any way and may not be used in any other
90-
programs, included programs derived from the PasHi source code, unless explicit
91-
permission is given by the author.
101+
The files may not be altered in any way and may not be used in any other
102+
programs, included programs derived from the PasHi or PasHiGUI source code,
103+
unless explicit permission is given by the author.
92104

93-
This means that if you modify PasHi and publish your changes then you must
105+
This means that if you modify the source and publish your changes then you must
94106
remove the icon or repace it with you own.
95107

96108
--------------------------------------------------------------------------------

0 commit comments

Comments
 (0)