]> git.cworth.org Git - apitrace/commitdiff
projects / apitrace / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ff0b1ee df64f2d)
Merge remote-tracking branch 'github/master' into mt-trace
authorJosé Fonseca <jose.r.fonseca@gmail.com>
Thu, 25 Oct 2012 11:28:32 +0000 (12:28 +0100)
committerJosé Fonseca <jose.r.fonseca@gmail.com>
Thu, 25 Oct 2012 11:28:32 +0000 (12:28 +0100)
Conflicts:
retrace/glws_cocoa.mm
wrappers/gltrace_state.cpp


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