aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/glx/util
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2015-04-301-0/+2
|
* Merge remote-tracking branch 'origin/released'marha2015-03-221-0/+186
Conflicts: mesalib/src/mapi/glapi/glapi.h mesalib/src/mapi/glapi/glapi_nop.c mesalib/src/mesa/main/bufferobj.c