aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config/symbols/cd.in
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2013-01-071-7/+7
| | | | | | | | | | | | | | | | | * origin/released: pixman xkbcomp libX11 libXau mesa fontconfig xserver xkeyboard-config git update 7 jan 2013 Conflicts: fontconfig/src/fcatomic.c pixman/pixman/pixman-mmx.c pixman/pixman/pixman-sse2.c xorg-server/dix/dispatch.c xorg-server/hw/xwin/wincursor.c xorg-server/hw/xwin/winmsg.c xorg-server/hw/xwin/winscrinit.c xorg-server/hw/xwin/winsetsp.c xorg-server/hw/xwin/winwin32rootless.c xorg-server/xfixes/cursor.c
* Merge remote-tracking branch 'origin/released'marha2011-12-051-1/+1
| | | | | Conflicts: xorg-server/dix/dispatch.c
* svn merge ^/branches/released .marha2011-04-051-69/+69
|
* svn merge ^/branches/released .marha2011-03-201-5/+5
|
* svn merge ^/branches/released .marha2011-03-041-0/+69