git.cworth.org Git - apitrace/commit

]> git.cworth.org Git - apitrace/commit - gui/mainwindow.cpp

author	José Fonseca <jose.r.fonseca@gmail.com>
	Mon, 9 May 2011 20:27:02 +0000 (21:27 +0100)
committer	José Fonseca <jose.r.fonseca@gmail.com>
	Mon, 9 May 2011 20:27:02 +0000 (21:27 +0100)
commit	c017dded3f1b3ebe3043b0e217bb3cd76a4e1a4e
tree	247dc9a77ad2d2e83981270a8d40f6a9bded367a	tree \| snapshot
parent	c90658521fa879fc439608099563ce491b69dfdc	commit \| diff
parent	4d7f1fec7a1561d474592b2b05b43685a29e8426	commit \| diff

Merge branch 'master' into multi-context

Conflicts:
glretrace.hpp
glretrace_main.cpp

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