diff options
author | Vicent Marti <tanoku@gmail.com> | 2012-05-19 03:46:11 +0400 |
---|---|---|
committer | Vicent Marti <tanoku@gmail.com> | 2012-05-19 03:46:11 +0400 |
commit | 5b9fac39d8a76b9139667c26a63e6b3f204b3977 (patch) | |
tree | e6ba28025f92c16563c4ffa8bc60b95f17d69691 /AUTHORS | |
parent | 7ef9f1b5606c2672105ecbbf34c022a71ef212fe (diff) | |
parent | ad5df35a47d56c3d716d7a56eac4aeb611987c11 (diff) |
Merge branch 'development'v0.17.0
Conflicts:
.travis.yml
Diffstat (limited to 'AUTHORS')
-rw-r--r-- | AUTHORS | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -36,7 +36,6 @@ Marc Pegon Marcel Groothuis Marco Villegas Olivier Ramonat -Peter Drahos Peter Drahoš Pierre Habouzit Przemyslaw Pawelczyk @@ -44,6 +43,7 @@ Ramsay Jones Robert G. Jakabosky Romain Geissler Romain Muller +Russell Belfer Sakari Jokinen Sam Sarath Lakshman |