commit 0446a1adad55886093c25bcdf714fd339c5ddcc9
Merge: 78a0de9c 52d99f42
Author:     Jonathan Dowland <jon+github@alcopop.org>
AuthorDate: Fri Mar 1 03:15:51 2019 +0000
Commit:     GitHub <noreply@github.com>
CommitDate: Fri Mar 1 03:15:51 2019 +0000

    Merge pull request #1142 from jmtd/petname

    Generate a random "pet" player username

 src/CMakeLists.txt      |   2 +
 src/Makefile.am         |   2 +
 src/net_client.c        |  16 +------
 src/net_petname.c       | 118 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/net_petname.h       |  18 ++++++++
 src/setup/multiplayer.c |  25 ++--------
 6 files changed, 145 insertions(+), 36 deletions(-)