diff options
| author | mouse <[email protected]> | 2019-06-23 20:54:17 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-06-23 20:54:17 +0800 |
| commit | 50e94dbf3140a45cd54b5b6b58e063f9e131dac1 (patch) | |
| tree | 9361af57c8459792e044672c34eaa890bfe75a2f /capplets/time-admin/src/time-map.h | |
| parent | 134c44845eb1ba8632f5f8ea8154d25effd6683b (diff) | |
| parent | 02b0b370ddaf85ab3a0a3e9b868eccf585560952 (diff) | |
| download | mate-control-center-50e94dbf3140a45cd54b5b6b58e063f9e131dac1.tar.bz2 mate-control-center-50e94dbf3140a45cd54b5b6b58e063f9e131dac1.tar.xz | |
Merge pull request #477 from mate-desktop/time-admin
time-admin: Fix license notice in time-zone.h|c, time-map.h|c
Thank you for your amendment. I will pay attention to the issue of license in the future.
Diffstat (limited to 'capplets/time-admin/src/time-map.h')
| -rw-r--r-- | capplets/time-admin/src/time-map.h | 41 |
1 files changed, 25 insertions, 16 deletions
diff --git a/capplets/time-admin/src/time-map.h b/capplets/time-admin/src/time-map.h index 979dceaf..bfc73e3f 100644 --- a/capplets/time-admin/src/time-map.h +++ b/capplets/time-admin/src/time-map.h @@ -1,19 +1,28 @@ -/* time-admin -* Copyright (C) 2018 zhuyaliang https://github.com/zhuyaliang/ -* -* 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 -* the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. - -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. - -* You should have received a copy of the GNU General Public License -* along with this program. If not, see <https://www.gnu.org/licenses/>. -*/ +/* + * Copyright (C) 2019 MATE Developers + * Copyright (C) 2018, 2019 zhuyaliang https://github.com/zhuyaliang/ + * Copyright (C) 2010-2018 The GNOME Project + * Copyright (C) 2010 Intel, Inc + * + * Portions from Ubiquity, Copyright (C) 2009 Canonical Ltd. + * Written by Evan Dandrea <[email protected]> + * + * 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 + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. + * + * Author: Thomas Wood <[email protected]> + * + */ #ifndef __TIME_MAP_H__ #define __TIME_MAP_H__ |