]> git.cworth.org Git - apitrace/commit
Merge branch 'attrib_list'
authorJosé Fonseca <jfonseca@vmware.com>
Sat, 20 Jul 2013 13:53:14 +0000 (14:53 +0100)
committerJosé Fonseca <jfonseca@vmware.com>
Sat, 20 Jul 2013 13:53:14 +0000 (14:53 +0100)
commitc037ae2b4f749aed15ede635a6b517534bc5a901
tree734451b8ee5a97a56c4a8fcae6d3c01a89496963
parentb34c6756b2e1abb6be20770f43f44d0b5e90f677
parenta78c14780294e326d79f3968f82de1e7bab412c2
Merge branch 'attrib_list'

Conflicts:
specs/glxapi.py
specs/glxapi.py
specs/wglapi.py