aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main/syncobj.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2013-01-221-3/+0
|\ | | | | | | | | | | | | | | | | | | | | * origin/released: fontconfig libfontenc mesa mkfontscale pixman xserver xkeyboard-config Conflicts: mesalib/src/mesa/main/syncobj.c mesalib/src/mesa/main/syncobj.h xorg-server/hw/xwin/winconfig.c xorg-server/hw/xwin/winmultiwindowwndproc.c
| * fontconfig libfontenc mesa mkfontscale pixman xserver xkeyboard-configmarha2013-01-221-3/+0
| | | | | | | | | | | | | | | | | | | | fontconfig: 000ca9ccb03013a5b151f0d21148ab0ca4c2f2de libfontenc: f5d1208172e965fdd7fae8927bd3e29b3cc3a975 mesa: 148fc6d53716f39971a453792570c2b8c207efb6 mkfontscale: 547517571e695728278a264eedbac47b6e1f43bc pixman: 2c6577476e5b18e17904ae8af244a39c352e2e33 xserver: 70b127c9f1c53bdb42f078265e67f76b464deae2 xkeyboard-config: 6b35b1b43d2fdff30f530d7cf65fffd6c3504690
* | Merge remote-tracking branch 'origin/released'marha2012-09-171-40/+0
|\| | | | | | | | | | | Conflicts: mesalib/src/mesa/main/syncobj.h pixman/pixman/pixman-mmx.c
| * mesa xserver pixman git update 17 sep 2012marha2012-09-171-40/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-051-119/+119
|\| | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mapi/glapi/glapi.h mesalib/src/mesa/main/syncobj.h xorg-server/dix/events.c xorg-server/dix/getevents.c xorg-server/include/misc.h
| * mkfontscale pixman xserver xtrans libX11 libXdmcp libxcb libXmu mesa git ↵marha2011-10-051-119/+119
| | | | | | | | update 5 oct 2011
* | svn merge ^/branches/released .marha2010-12-291-115/+119
|\|
| * xserver and mesa git update 28-12-2010marha2010-12-281-115/+119
| |
* | svn merge ^/branches/released .marha2010-11-291-1/+46
|\|
| * Updated to mesalib 7.9marha2010-11-221-1/+46
| |
| * Updated to mesa_7_6_1_rc1marha2009-12-221-6/+6
| |
* | Opengl is working now.marha2009-10-091-11/+11
|/
* Added MesaLib-7.6marha2009-10-081-0/+70