aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mapi/glapi/gen/GL3x.xml
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-10-251-2/+3
|\ | | | | | | | | * origin/released: fontconfig mesa pixman git update
| * fontconfig mesa pixman git updatemarha2012-10-251-2/+3
| | | | | | | | | | | | fonconfig: 73ab254336100c5971e3a1e14b73222efd0e9822 mesa: 86cd77d0a9ac940c2c06eebc5e9ef840d176712a pixman: 9df645dfb04b5a790faabe1e9a84fc37287d91b0
* | Merge remote-tracking branch 'origin/released'marha2012-10-171-34/+34
|\| | | | | | | | | * origin/released: pixman mesa git update 17 oct 2012
| * pixman mesa git update 17 oct 2012marha2012-10-171-34/+34
| | | | | | | | | | pixman: 6e56098c0338ce74228187e4c96fed1a66cb0956 mesa: 0199ff7fe323cf527ffacfdef3258ab85799dd13
* | Merge remote-tracking branch 'origin/released'marha2012-06-281-1/+1
|\|
| * xkeyboard-config mesa fontconfig randrproto git update 28 Jun 2012marha2012-06-281-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-151-0/+40
|\| | | | | | | | | | | | | | | Conflicts: fontconfig/src/fcint.h fontconfig/src/fcstat.c mesalib/src/mapi/glapi/gen/GL3x.xml xorg-server/glx/glxext.h
| * fontconfig mesa pixman xserver git update 15 juni 2012marha2012-06-151-0/+40
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-101-1/+1
|\| | | | | | | | | Conflicts: xorg-server/os/log.c
| * fontconfig mesa xkeyboard-config xserver pixman git update 10 Apr 2012marha2012-04-101-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2012-03-281-2/+7
|\|
| * fontconfig libxcb xcb-proto mesa xserver git update 27 Mar 2012marha2012-03-271-2/+7
| |
* | Synchronised filesmarha2011-11-071-2/+6
| |
* | Synchronised line endinge with release branchmarha2011-09-121-589/+589
| |
* | svn merge ^/branches/released .marha2011-03-281-2/+2
|\|
| * xserver xkeyboard-config mesa git update 28 Mar 2011marha2011-03-281-589/+589
|/
* xserver and mesa git update 28-12-2010marha2010-12-281-0/+589