aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/include/callback.h
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-03-261-98/+94
|\
| * libX11 xserver fontconfig mesa pixman xkbcomp xkeyboard-config git updatemarha2012-03-231-94/+90
* | svn merge ^/branches/released .marha2010-10-141-87/+98
|\|
| * xserver git update 14/10/2010marha2010-10-141-87/+94
| * xserver git update 4/5/2010marha2010-05-041-0/+87
* svn merge -r571:HEAD "^/branches/released" .marha2010-05-051-0/+87