aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mapi/glapi/glapi.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-07-12 08:07:49 +0200
committermarha <marha@users.sourceforge.net>2011-07-12 08:07:49 +0200
commitf9f3118e6636a03c096898e023e7e13a328cbaed (patch)
tree2799648cd825202ce426fc1e55b235a8d9ebbb03 /mesalib/src/mapi/glapi/glapi.h
parent7a945c825829cbadecebc3723e96a786244b9971 (diff)
parent3b47b2c35227184c0eb6dcf6dee8b79c4f9d4474 (diff)
downloadvcxsrv-f9f3118e6636a03c096898e023e7e13a328cbaed.tar.gz
vcxsrv-f9f3118e6636a03c096898e023e7e13a328cbaed.tar.bz2
vcxsrv-f9f3118e6636a03c096898e023e7e13a328cbaed.zip
Merge remote-tracking branch 'origin/released'
Conflicts: mesalib/src/mesa/main/depthstencil.c mesalib/src/mesa/main/formats.c mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
Diffstat (limited to 'mesalib/src/mapi/glapi/glapi.h')
0 files changed, 0 insertions, 0 deletions