diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2015-08-05 23:04:01 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2015-08-06 00:04:25 +0200 |
| commit | 041024fbb96c4b56a948e26fe75d3115e13edf31 (patch) | |
| tree | dab147a3e4ea8e89e0a5acab8cc6866046fad8d2 /src/Common/Combo.h | |
| parent | a23943694b715ecd4f5e7f6eb9c86b7f9a422851 (diff) | |
| download | VeraCrypt-041024fbb96c4b56a948e26fe75d3115e13edf31.tar.gz VeraCrypt-041024fbb96c4b56a948e26fe75d3115e13edf31.zip | |
Update license information to reflect the use of a dual license Apache 2.0 and TrueCrypt 3.0.
Diffstat (limited to 'src/Common/Combo.h')
| -rw-r--r-- | src/Common/Combo.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/Common/Combo.h b/src/Common/Combo.h index 6677439a..9bd67a92 100644 --- a/src/Common/Combo.h +++ b/src/Common/Combo.h @@ -1,16 +1,18 @@ /*
Legal Notice: Some portions of the source code contained in this file were
- derived from the source code of Encryption for the Masses 2.02a, which is
- Copyright (c) 1998-2000 Paul Le Roux and which is governed by the 'License
- Agreement for Encryption for the Masses'. Modifications and additions to
- the original source code (contained in this file) and all other portions
- of this file are Copyright (c) 2003-2008 TrueCrypt Developers Association
- and are governed by the TrueCrypt License 3.0 the full text of which is
- contained in the file License.txt included in TrueCrypt binary and source
+ derived from the source code of TrueCrypt 7.1a, which is
+ Copyright (c) 2003-2012 TrueCrypt Developers Association and which is
+ governed by the TrueCrypt License 3.0, also from the source code of
+ Encryption for the Masses 2.02a, which is Copyright (c) 1998-2000 Paul Le Roux
+ and which is governed by the 'License Agreement for Encryption for the Masses'
+ Modifications and additions to the original source code (contained in this file)
+ and all other portions of this file are Copyright (c) 2013-2015 IDRIX
+ and are governed by the Apache License 2.0 the full text of which is
+ contained in the file License.txt included in VeraCrypt binary and source
code distribution packages. */
#ifdef __cplusplus
extern "C" {
#endif
void AddComboItem (HWND hComboBox, char *lpszFileName, BOOL saveHistory);
|