summaryrefslogtreecommitdiff
path: root/AUTHORS
diff options
context:
space:
mode:
authorGuy Sagnes <guy.sagnes@continental-corporation.com>2014-09-17 17:25:41 +0200
committerGuy Sagnes <guy.sagnes@continental-corporation.com>2014-09-17 17:33:23 +0200
commit62b1fadc6711a7152961086d92d1ef4d876768b2 (patch)
treeff742219b3b81e3258237f01f442b8d25ce5f940 /AUTHORS
parent538a645c0325172ec76b2ec62b45f5a3e3f512f7 (diff)
parente0d795f0ee22040ec97ee27f80218250831905be (diff)
downloadpersistence-common-object-62b1fadc6711a7152961086d92d1ef4d876768b2.tar.gz
Merge remote-tracking branch 'genivi/master' (Key Value Store)7.01.0.2
Conflicts: src/Makefile.am Change-Id: I930ce4078a897e7811ad764fd1d6a9ab217abd8f
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS1
1 files changed, 1 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index a776944..d143966 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,3 +1,4 @@
Ionut Ieremie <Ionut.Ieremie@continental-corporation.com>
Guy Sagnes <Guy.Sagnes@continental-corporation.com>
Petrica Manoila <Petrica.Manoila@continental-corporation.com>
+Simon Disch <simon.disch@xse.de>