]> git.cworth.org Git - apitrace/commitdiff
projects / apitrace / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 29d2162 82e3546)
Merge branch 'master' into multi-context
authorJosé Fonseca <jose.r.fonseca@gmail.com>
Fri, 6 May 2011 23:35:52 +0000 (00:35 +0100)
committerJosé Fonseca <jose.r.fonseca@gmail.com>
Fri, 6 May 2011 23:35:52 +0000 (00:35 +0100)
1  2 
glstate.py patch | diff1 | diff2 | blob | history

diff --cc glstate.py
Simple merge
Carl's hacks to apitrace (upstream at https://github.com/apitrace/apitrace)