]> mj.ucw.cz Git - libucw.git/commitdiff
projects / libucw.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 659199e e4c7011)
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)
Conflicts:
ucw/ff-varint.c
ucw/varint.c


Trivial merge
UCW libraries