diff options
| author | Cedric Nugteren <web@cedricnugteren.nl> | 2016-09-21 20:57:23 +0200 |
|---|---|---|
| committer | Cedric Nugteren <web@cedricnugteren.nl> | 2016-09-21 20:57:23 +0200 |
| commit | 63003a1429d22309345bffd9fecded59db5698c2 (patch) | |
| tree | 8414d73482bba33054ade32edf0a6553e9f096d3 | |
| parent | 4b94afda941a86f363064ff02f97e21eb9618794 (diff) | |
| parent | d13a98272b67c78ccb0f96d8812202c7fad63eda (diff) | |
Merge branch 'master' into development
| -rw-r--r-- | README.md | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -284,7 +284,7 @@ The contributing authors (code, pull requests, testing) so far are: * [Cedric Nugteren](http://www.cedricnugteren.nl) - main author * [Anton Lokhmotov](https://github.com/psyhtest) * [Dragan Djuric](https://github.com/blueberry) -* [Marco Hutter](https://github.com/gpus) +* [Marco Hutter](http://marco-hutter.de/) * [Hugh Perkins](https://github.com/hughperkins) * [Gian-Carlo Pascutto](https://github.com/gcp) * [Ivan Shapovalov](https://github.com/intelfx) |