From 45cb4a2652fef78ee674b13841a070d39daa8ca6 Mon Sep 17 00:00:00 2001 From: michael starke Date: Sun, 21 Jul 2013 14:41:37 +0200 Subject: [PATCH] Updated Credits --- KeePassKit | 2 +- MacPass/MacPass-Info.plist | 2 +- MacPass/de.lproj/Credits.rtf | 10 +++++++--- MacPass/en.lproj/Credits.rtf | 9 ++++++--- README.md | 2 ++ 5 files changed, 17 insertions(+), 8 deletions(-) diff --git a/KeePassKit b/KeePassKit index c0665e40..2ae0ec06 160000 --- a/KeePassKit +++ b/KeePassKit @@ -1 +1 @@ -Subproject commit c0665e4052c2096e4f84f305b59c2315d5b6c9a2 +Subproject commit 2ae0ec067cf75e64fed71f2b2f11427989814927 diff --git a/MacPass/MacPass-Info.plist b/MacPass/MacPass-Info.plist index fab09767..87e65454 100644 --- a/MacPass/MacPass-Info.plist +++ b/MacPass/MacPass-Info.plist @@ -48,7 +48,7 @@ CFBundleSignature ???? CFBundleVersion - 2517 + 2518 LSMinimumSystemVersion ${MACOSX_DEPLOYMENT_TARGET} NSHumanReadableCopyright diff --git a/MacPass/de.lproj/Credits.rtf b/MacPass/de.lproj/Credits.rtf index 193d8411..faa54f9e 100644 --- a/MacPass/de.lproj/Credits.rtf +++ b/MacPass/de.lproj/Credits.rtf @@ -58,9 +58,13 @@ Copyright \'a92013, {\field{\*\fldinst{HYPERLINK "http://stackoverflow.com/users Basierend auf dem Code im CocoaDev Wiki\ \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 -{\field{\*\fldinst{HYPERLINK "https://github.com/karelia/SecurityInterface"}}{\fldrslt \cf3 KSPasswordField}}\kerning1\expnd0\expndtw3 +{\field{\*\fldinst{HYPERLINK "https://github.com/karelia/SecurityInterface"}}{\fldrslt \cf3 KSPasswordField}}\cf3 \kerning1\expnd0\expndtw3 \ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 -\cf3 \kerning1\expnd0\expndtw0 Quelltext wird in HNHRoundedSecureTextField verwendet\kerning1\expnd0\expndtw3 +\cf3 \kerning1\expnd0\expndtw0 Quelltext wird in HNHRoundedSecureTextField verwendet\cf3 \kerning1\expnd0\expndtw3 \ -\kerning1\expnd0\expndtw0 Copyright \'a92012 Mike Abdullah, Karelia Software. Alle Rechte vorbehalten.} \ No newline at end of file +\cf3 \kerning1\expnd0\expndtw0 Copyright \'a92012 Mike Abdullah, Karelia Software. Alle Rechte vorbehalten.\ +\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 +{\field{\*\fldinst{HYPERLINK "https://github.com/AlanQuatermain/aqtoolkit"}}{\fldrslt \cf3 NSData+CommonCrypto}}\ +Copyright \'a92008-2009 Jim Dovey, Alle Rechte vorbehalten.} \ No newline at end of file diff --git a/MacPass/en.lproj/Credits.rtf b/MacPass/en.lproj/Credits.rtf index 20328677..7c680277 100644 --- a/MacPass/en.lproj/Credits.rtf +++ b/MacPass/en.lproj/Credits.rtf @@ -11,9 +11,8 @@ \b \ License:\ -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 -\b0 \cf0 MacPass KeePass compatible client for OS X\ +\b0 MacPass KeePass compatible client for OS X\ Copyright (c) 2012-2013 Michael Starke, HicknHack Software GmbH\ \ This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by\ @@ -64,4 +63,8 @@ Extracted from code on the CocoaDev Wiki\ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 {\field{\*\fldinst{HYPERLINK "https://github.com/karelia/SecurityInterface"}}{\fldrslt \cf3 KSPasswordField}}\ Code reused in HNHRoundedSecureTextField\ -Copyright \'a92012 Mike Abdullah, Karelia Software. All rights reserved.} \ No newline at end of file +Copyright \'a92012 Mike Abdullah, Karelia Software. All rights reserved.\ +\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 +{\field{\*\fldinst{HYPERLINK "https://github.com/AlanQuatermain/aqtoolkit"}}{\fldrslt \cf3 NSData+CommonCrypto}}\ +Copyright \'a92008-2009 Jim Dovey, All rights reserved.} \ No newline at end of file diff --git a/README.md b/README.md index 8e2ddd84..e95240ab 100644 --- a/README.md +++ b/README.md @@ -83,3 +83,5 @@ This Project is based upon the following work: [CocoaHTTPServer](https://github.com/robbiehanson/CocoaHTTPServer ) Copyright 2011, Deusty, LLC. All rights reserved. [KSPasswordField](https://github.com/karelia/SecurityInterface) Copyright 2012 Mike Abdullah, Karelia Software. All rights reserved. + +See submodules for additional Licenses