summaryrefslogtreecommitdiff
path: root/AUTHORS
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-05-31 23:24:59 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-05-31 23:24:59 +0200
commit703721ff8e0955029c99208b7d99f7bde68243f4 (patch)
tree8380a4a5c7aedd162cc2b7d8d33a17d9e4e436d8 /AUTHORS
parent0e7659200e3c881e354aab00b758d25408a21544 (diff)
parenta1e93482d9cc9ace5fc1494677b45d965f1ddcb7 (diff)
Merge tag 'upstream/3.1' into feature/upstream
Upstream version 3.1
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS2
1 files changed, 2 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index d4badfa..748b985 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -19,6 +19,8 @@ Jarod Wilson <jarod@redhat.com>
Anton Arapov <anton@redhat.com>
Roy Franz <roy.franz@linaro.org>
Tyler Bell <tyler.bell@hp.com>
+Xie XiuQi <xiexiuqi@huawei.com>
+Petr Oros <poros@redhat.com>
MANY THANKS TO (IN CHRONOLOGICAL ORDER)
Werner Heuser