Mercurial > hg > syntilista
changeset 236:2e0fcb3d0b95
Merged.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Mon, 07 May 2018 18:37:08 +0300 |
parents | 20ce1339f36b (diff) 4a993456df9f (current diff) |
children | 54ab3f3e28c0 |
files | |
diffstat | 3 files changed, 16 insertions(+), 53 deletions(-) [+] |
line wrap: on
line diff
--- a/COPYING Mon May 07 12:31:46 2018 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,43 +0,0 @@ -Syntilista - debt list/management database program -================================================== -Programmed and designed by Matti 'ccr' Hämäläinen <ccr@tnsp.org> -(C) Copyright 2017-2018 Tecnic Software productions (TNSP) - - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - - 3. The name of the author may not be used to endorse or promote - products derived from this software without specific prior written - permission. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR -IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, -INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING -IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. - - -Qt 5 framework -============== -This software ("Syntilista") uses the cross-platform Qt 5 application -framework, licensed under GNU Lesser General Public License version 3 -(LGPL v3). Please refer to Qt and GNU websites for more information. - -https://www.qt.io/ -https://www.gnu.org/licenses/lgpl-3.0.en.html
--- a/COPYING.html Mon May 07 12:31:46 2018 +0300 +++ b/COPYING.html Mon May 07 18:37:08 2018 +0300 @@ -1,15 +1,9 @@ -<h1>Qt 5 framework</h1> +<h1>Syntilista license</h1> <p> -This software ("Syntilista") uses the cross-platform Qt 5 application -framework, licensed under GNU Lesser General Public License version 3 -(LGPL v3). Please refer to Qt and GNU websites for more information. -</p> -<p> -<a href="https://www.qt.io/">https://www.qt.io/</a> -<a href="https://www.gnu.org/licenses/lgpl-3.0.en.html">https://www.gnu.org/licenses/lgpl-3.0.en.html</a> +Programmed and designed by Matti 'ccr' Hämäläinen <ccr@tnsp.org><br> +(C) Copyright 2017-2018 Tecnic Software productions (TNSP) </p> -<h1>Syntilista license</h1> <p>Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -42,3 +36,15 @@ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. </p> + +<h1>Qt 5 framework</h1> +<p> +This software ("Syntilista") uses the cross-platform Qt 5 application +framework, licensed under GNU Lesser General Public License version 3 +(LGPL v3). Please refer to Qt and GNU websites for more information. +</p> +<p> +<a href="https://www.qt.io/">https://www.qt.io/</a> +<a href="https://www.gnu.org/licenses/lgpl-3.0.en.html">https://www.gnu.org/licenses/lgpl-3.0.en.html</a> +</p> +
--- a/build-win32.sh Mon May 07 12:31:46 2018 +0300 +++ b/build-win32.sh Mon May 07 18:37:08 2018 +0300 @@ -51,7 +51,7 @@ done cp -f "$BUILDPATH/Syntilista.exe" "$TARGET" - unix2dos -n "COPYING" "$TMPFILE" && cp -f "$TMPFILE" "$TARGET/COPYING.txt" + unix2dos -n "COPYING.html" "$TMPFILE" && cp -f "$TMPFILE" "$TARGET/COPYING.txt" rm -f "$TMPFILE" return 0 }