aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/glx/glfunctions.h
Commit message (Collapse)AuthorAgeFilesLines
* Synchronised filesmarha2014-05-111-0/+16
|
* Merge remote-tracking branch 'origin/released'marha2014-03-091-4/+0
| | | | | | | | | * origin/released: fontconfig mesa xserver git update 9 Mar 2014 Conflicts: mesalib/src/mapi/glapi/glapi.h xorg-server/hw/kdrive/ephyr/hostx.c
* Merge remote-tracking branch 'origin/released'marha2014-03-041-1/+45
| | | | | | | | | | | | | | * origin/released: libX11 libxcb mesa xserver xcb-proto xkeyboard-config git update 4 Mar 2014 Conflicts: mesalib/src/mapi/glapi/glapi.h mesalib/src/mapi/glapi/glthread.c mesalib/src/mesa/drivers/dri/common/dri_util.c mesalib/src/mesa/main/bufferobj.c xorg-server/dix/dispatch.c xorg-server/hw/xwin/glx/gen_gl_wrappers.py xorg-server/hw/xwin/winmultiwindowwm.c
* Synchronised files and added missing files in mesa projectmarha2014-02-101-0/+2
|
* Synchronised files and updated mesa project filemarha2014-01-271-0/+12
|
* Solved compile problems due to latest mergemarha2013-12-221-0/+1120