diff options
author | Toni Uhlig <matzeton@googlemail.com> | 2019-04-03 10:09:02 +0200 |
---|---|---|
committer | Toni Uhlig <matzeton@googlemail.com> | 2019-04-03 10:09:02 +0200 |
commit | b66f10141b1062865bc7fa89c5e4ff0664665269 (patch) | |
tree | 8aa864545e7903c103c7d0c6ff3f799da81b88d0 /AUTHORS | |
parent | f615ca91176a486b75bd3b060e4e264fb470c755 (diff) | |
parent | 1c04661dc9b11c6506e96a21e79b3587b4038a28 (diff) |
Merge branch 'master' into release
Diffstat (limited to 'AUTHORS')
-rw-r--r-- | AUTHORS | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -2,3 +2,5 @@ Daniel Stoedle <daniels@cs.uit.no> Mike Miller <mike@mikeage.net> Toni Uhlig <matzeton@googlemail.com> Sebastien Raveau <sebastien.raveau@epita.fr> +Masaq- <tilt@techie.com> +elnerd <erlend.leiknes@gmail.com> |