summaryrefslogtreecommitdiff
path: root/AUTHORS
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-06-24 23:08:32 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-06-24 23:08:32 +0200
commit4510bf89cdef11a5bf0eea1e8c5da6b7bcc77ce4 (patch)
tree316792a49717d4966055d8697ee465ef5bdb17c3 /AUTHORS
parent0e7659200e3c881e354aab00b758d25408a21544 (diff)
parentcbda69b295122262360b0899ad2f5275ace1179d (diff)
Merge branch 'feature/upstream' into develop
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