Rebase on top of 3.2

acidanthera · May 23, 2019 · 293f09b · 293f09b
1 parent 58ad468
commit 293f09b
Show file tree

Hide file tree

Showing 23 changed files with 2,034 additions and 1,720 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -1,9 +1,9 @@
 DEVELOPER AND MAINTAINER
-Anton Arapov <[email protected]>
+Jean Delvare <[email protected]>
 
 ORIGINAL AUTHORS
 Alan Cox <[email protected]>
-Jean Delvare <[email protected]>
+Jean Delvare <[email protected]>
 
 CODE CONTRIBUTORS (IN CHRONOLOGICAL ORDER)
 Matt Domsch <[email protected]>
@@ -16,6 +16,11 @@ Roberto Nibali <[email protected]>
 John Cagle <[email protected]>
 Jens Elkner <[email protected]>
 Jarod Wilson <[email protected]>
+Anton Arapov <[email protected]>
+Roy Franz <[email protected]>
+Tyler Bell <[email protected]>
+Xie XiuQi <[email protected]>
+Petr Oros <[email protected]>
 
 MANY THANKS TO (IN CHRONOLOGICAL ORDER)
 Werner Heuser
@@ -84,3 +89,4 @@ Thomas Mingarelli
 Andrey Matveyev
 Stefan Tauner
 Naga Chumbalkar
+Jens Rosenboom