mj.ucw.cz Git - libucw.git/commit

]> mj.ucw.cz Git - libucw.git/commit

projects / libucw.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f9b678a c681101)

author	Martin Mares <mj@ucw.cz>
	Sat, 11 Feb 2012 11:20:31 +0000 (12:20 +0100)
committer	Martin Mares <mj@ucw.cz>
	Sat, 11 Feb 2012 11:20:31 +0000 (12:20 +0100)
commit	ba1c173f544383aa6553a75dee6e6858d8f243a4
tree	3402a34489aa9e0bcc9653247d4abf5e9af2f24e	tree \| snapshot
parent	f9b678a9ecb9077c0f96d65eff602b781c2551b4	commit \| diff
parent	c681101e384bb5633396364586b0d3667238d755	commit \| diff

Merge branch 'dev-trans'

Conflicts:
ucw/Makefile
ucw/string.h

ucw/Makefile	diff1 \|	diff2 \|	blob \| history
ucw/doc/index.txt	diff1 \|	diff2 \|	blob \| history
ucw/fb-atomic.c	diff1 \|	diff2 \|	blob \| history
ucw/fb-direct.c	diff1 \|	diff2 \|	blob \| history
ucw/fb-file.c	diff1 \|	diff2 \|	blob \| history
ucw/fb-mmap.c	diff1 \|	diff2 \|	blob \| history
ucw/fb-param.c	diff1 \|	diff2 \|	blob \| history
ucw/lib.h	diff1 \|	diff2 \|	blob \| history
ucw/string.h	diff1 \|	diff2 \|	blob \| history
ucw/threads.h	diff1 \|	diff2 \|	blob \| history

UCW libraries