]> mj.ucw.cz Git - libucw.git/commit
Merge branch 'master' into dev-sizet
authorPavel Charvat <pchar@ucw.cz>
Wed, 4 Jun 2014 00:08:15 +0000 (02:08 +0200)
committerPavel Charvat <pchar@ucw.cz>
Wed, 4 Jun 2014 00:08:15 +0000 (02:08 +0200)
commitf1155256f7a168f5e2c0097cb4e7197b79c4f041
treed8bdd38e671fdf4c51be952235504b6242e2b197
parentda418321735b159f0ff39366d68203c772f152d4
parent6912c77a66798de162fe31f79581cd7b5c97f12c
Merge branch 'master' into dev-sizet

Conflicts:
ucw/bbuf.c
ucw/bbuf.h
ucw/doc/mempool.txt
ucw/fastbuf.h
ucw/fb-pool.c
ucw/gbuf.h
ucw/io-mmap.c
ucw/io.h
ucw/mempool-fmt.c
ucw/mempool-str.c
ucw/mempool.c
ucw/mempool.h
ucw/str-hex.c
ucw/string.c
ucw/string.h
ucw/unicode.c
ucw/unicode.h
12 files changed:
ucw/bbuf.c
ucw/fastbuf.h
ucw/fb-pool.c
ucw/mempool-fmt.c
ucw/mempool-str.c
ucw/mempool.c
ucw/mempool.h
ucw/str-hex.c
ucw/string.c
ucw/string.h
ucw/unicode.c
ucw/unicode.h