diff options
author | Gary Kramlich <grim@reaperworld.com> | 2018-03-29 23:20:36 -0500 |
---|---|---|
committer | Gary Kramlich <grim@reaperworld.com> | 2018-03-29 23:20:36 -0500 |
commit | 06d82bdc2b787578b9132c3a42639447fd357326 (patch) | |
tree | fa657d2779889bb253be6c6782f63039549280c2 /COPYRIGHT | |
parent | f6660ec4adb0fb8da9370c9217e4483c25e2b3f8 (diff) | |
parent | 7774b011731b0f23b07fcbaed08825550a4a3c68 (diff) | |
download | pidgin-06d82bdc2b787578b9132c3a42639447fd357326.tar.gz |
Mergin 2.13.0 into default
Diffstat (limited to 'COPYRIGHT')
-rw-r--r-- | COPYRIGHT | 10 |
1 files changed, 9 insertions, 1 deletions
@@ -15,7 +15,7 @@ If concerns are raised as to the copyright holder of a particular piece of code, then that code should be traced through our version control system to see from where it came and who has modified it. -Copyright (C) 1998-2014 by the following: +Copyright (C) 1998-2018 by the following: Mark Saleem Abdulrasool @@ -54,6 +54,7 @@ Stefan Becker Carlos Bederian Dave Bell Matthew W.S. Bell +bellet Igor Belyi David Benjamin Brian Bernas @@ -158,6 +159,7 @@ Mark Doliner Nuno Donato Jim Duchek Alex Duggan +dx Tom Dyas Marc E. Andrew Echols @@ -317,9 +319,11 @@ Ho-seok Lee Jean-Yves Lefort Moses Lei Ambrose C. Li +Tom Li Nicolas Lichtmaier Wesley Lin Shaun Lindsay +Shivaram Lingamneni Artem Litvinovich Josh Littlefield Daniel Ljungborg @@ -358,6 +362,7 @@ James McLaughlin Torrey McMahon Greg McNew Robert McQueen +Christof Meerwald Mihály Mészáros Robert Mibus David Michael @@ -383,6 +388,7 @@ Keith Moyer Andrei Mozzhuhin Christian Muise MXit Lifestyle (Pty) Ltd. +Shawn Napora Alexander Nartov Richard Nelson Dennis Nezic @@ -410,6 +416,7 @@ Nathan Owens (pianocomp81) John Oyler Matt Pandina Laszlo Pandy +Paradox Giulio 'Twain28' Pascali Ricardo Fernandez Pascual Riley Patterson @@ -640,6 +647,7 @@ Timmy Yee Li Yuan Yuriy Yevgrafov Jan Zachorowski +zelch Nickolai Zeldovich Tom Zickel Marco Ziech |