git.cworth.org Git - apitrace/commit

author	José Fonseca <jose.r.fonseca@gmail.com>
	Tue, 11 Dec 2012 07:20:26 +0000 (07:20 +0000)
committer	José Fonseca <jose.r.fonseca@gmail.com>
	Tue, 11 Dec 2012 07:20:26 +0000 (07:20 +0000)
commit	9db16b3989481f8d6dfc8932d760fcc16217ecbd
tree	a86eb117302c861ebcf22fdf70f29433f35e8bd2	tree \| snapshot
parent	4f74cc67dd2b46d2abc0be5663c992410420091b	commit \| diff
parent	55bbe59856e69770490186ff08b6668e6d1c674c	commit \| diff

Merge branch 'trim-auto'

Conflicts:
cli/CMakeLists.txt

Carl's hacks to apitrace (upstream at https://github.com/apitrace/apitrace)