projects / umurmur.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e3d75b4 77e7246)
Merge branch 'ipv6' of github.com:fmorgner/umurmur into ipv6
authorFelix Morgner <felix.morgner@gmail.com>
Thu, 22 May 2014 16:20:46 +0000 (18:20 +0200)
committerFelix Morgner <felix.morgner@gmail.com>
Thu, 22 May 2014 16:20:46 +0000 (18:20 +0200)
Conflicts:
src/client.c
src/server.c


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.