Commit 2837e620 authored by David Faure's avatar David Faure
Browse files

Merge remote-tracking branch 'origin/release/19.12'

parents 7286b1e2 8f2f329d
...@@ -159,6 +159,7 @@ my %old_license_table_2 = ( ...@@ -159,6 +159,7 @@ my %old_license_table_2 = (
'harris' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'harris' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ],
'hausmann' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'hausmann' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ],
'heikobecker' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', ], 'heikobecker' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', ],
'hein' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ],
'hdhoang' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'hdhoang' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ],
'hindenburg' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'hindenburg' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ],
'hoelzer' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'hoelzer' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ],
...@@ -191,6 +192,7 @@ my %old_license_table_2 = ( ...@@ -191,6 +192,7 @@ my %old_license_table_2 = (
'leonhard' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'leonhard' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ],
'lilachaze' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'lilachaze' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ],
'lliehu' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'lliehu' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ],
'lukas' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ],
'lvsouza' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'lvsouza' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ],
'lypanov' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'lypanov' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ],
'majewsky' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'majewsky' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ],
...@@ -257,6 +259,7 @@ my %old_license_table_2 = ( ...@@ -257,6 +259,7 @@ my %old_license_table_2 = (
'staniek' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'staniek' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ],
'sune' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'sune' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ],
'taj' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+' ], 'taj' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+' ],
'tanton' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+' ],
'tenharmsel' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'tenharmsel' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ],
'teske' => ['gplv23', 'lgplv23', ], 'teske' => ['gplv23', 'lgplv23', ],
'tfry' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+' ], 'tfry' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+' ],
...@@ -280,6 +283,7 @@ my %old_license_table_2 = ( ...@@ -280,6 +283,7 @@ my %old_license_table_2 = (
'willy' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'willy' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ],
'woebbe' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'woebbe' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ],
'wstephens' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'wstephens' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ],
'yurchor' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ],
'zack' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'zack' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ],
'zecke' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ] 'zecke' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ]
# Do not add anything here. Use license_table instead. # Do not add anything here. Use license_table instead.
...@@ -396,6 +400,7 @@ my %secondary_mail_addresses = ( ...@@ -396,6 +400,7 @@ my %secondary_mail_addresses = (
'ABBAPOH@me.com' => 'ikomissarov', 'ABBAPOH@me.com' => 'ikomissarov',
'aetf@unlimitedcodeworks.xyz' => 'peifengyu', 'aetf@unlimitedcodeworks.xyz' => 'peifengyu',
'aleixpol@kde.org' => 'apol', 'aleixpol@kde.org' => 'apol',
'alex.merry@kde.org' => 'alexmerry',
'arichardson.kde@googlemail.com' => 'arichardson', 'arichardson.kde@googlemail.com' => 'arichardson',
'asmond@gmx.com' => 'asensi', 'asmond@gmx.com' => 'asensi',
'athurh@gmail.com' => 'athurhfree', 'athurh@gmail.com' => 'athurhfree',
...@@ -414,6 +419,7 @@ my %secondary_mail_addresses = ( ...@@ -414,6 +419,7 @@ my %secondary_mail_addresses = (
'keziolio123@gmail.com' => 'kezik', 'keziolio123@gmail.com' => 'kezik',
'kubito@gmail.com' => 'rkcosta', 'kubito@gmail.com' => 'rkcosta',
'lamarque@gmail.com' => 'lvsouza', 'lamarque@gmail.com' => 'lvsouza',
'majewsky@gmx.net' => 'majewsky',
'malte@kde.org' => 'malte', 'malte@kde.org' => 'malte',
'mk-lists@email.de' => 'kaning', 'mk-lists@email.de' => 'kaning',
'neoclust.kde@free.fr' => 'nlecureuil', 'neoclust.kde@free.fr' => 'nlecureuil',
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment