]> mj.ucw.cz Git - libucw.git/commit
Merge branch 'master' into dev-opt
authorPavel Charvat <pchar@ucw.cz>
Tue, 14 Jan 2014 19:51:05 +0000 (20:51 +0100)
committerPavel Charvat <pchar@ucw.cz>
Tue, 14 Jan 2014 19:51:05 +0000 (20:51 +0100)
commit28388e8af05157d893f76c82599a7c15085ebf8a
tree97c6ab32396ec580348e298c4f18991cfab971b9
parent659199e6b6d47105bdc9fab8aea8cf0ac19e1639
parente4c70112ddbe8a1b012ea47c88d9134748d22077
Merge branch 'master' into dev-opt

Conflicts:
ucw/ff-varint.c
ucw/varint.c