aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkb/xkbActions.c
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2014-11-291-8/+8
|\
| * fontconfig libX11 libxcb libxcb/xcb-proto mesa xserver xkbcomp xkeyboard-conf...marha2014-11-291-8/+8
* | Merge remote-tracking branch 'origin/released'marha2014-03-121-32/+70
|\|
| * mesa xserver xkbcomp git update 12 Mar 2014marha2014-03-121-32/+70
* | Merge remote-tracking branch 'origin/released'marha2014-01-151-3/+3
|\|
| * mesa xkeyboard-config xserver git update 15 jan 2014marha2014-01-151-3/+3
| * fontconfig mesa pixman xserver git update 25 Mar 2013marha2013-04-111-69/+80
* | Merge remote-tracking branch 'origin/released'marha2013-03-251-69/+80
|\ \
| * | fontconfig mesa pixman xserver git update 25 Mar 2013marha2013-03-251-69/+80
| |/
* | Merge remote-tracking branch 'origin/released'marha2013-02-111-57/+90
|\|
| * xserver mesa git update 11 Feb 2013marha2013-02-111-57/+90
* | Merge remote-tracking branch 'origin/released'marha2012-05-151-1/+0
|\|
| * xserver mesa git update 15 May 2012marha2012-05-151-1/+0
* | Merge remote-tracking branch 'origin/released'marha2012-03-261-1023/+1060
|\|
| * libX11 xserver fontconfig mesa pixman xkbcomp xkeyboard-config git updatemarha2012-03-231-1023/+1060
* | Merge remote-tracking branch 'origin/released'marha2012-01-111-1/+1
|\|
| * mesa pixman xserver git update 11 jan 2012marha2012-01-111-1/+1
* | Merge remote-tracking branch 'origin/released'marha2011-12-161-4/+5
|\|
| * xserver git update 16 dec 2011marha2011-12-161-4/+5
* | Merge remote-tracking branch 'origin/released'marha2011-11-171-1/+1
|\|
| * xserver mesa git update 17 nov 2011marha2011-11-171-1/+1
* | Merge remote-tracking branch 'origin/released'marha2011-10-271-2/+5
|\|
| * libX11 libXft mesa mkfontscale pixman xserver git update 26 okt 2011marha2011-10-261-2/+5
* | Synchronised line endinge with release branchmarha2011-09-121-1435/+1435
* | merge ^/branches/released .marha2011-05-161-2/+2
|\|
| * xserver xkeyboar-config mesa git update 16 May 2011marha2011-05-161-1434/+1434
* | svn merge ^/branches/released .marha2011-03-151-9/+2
|\|
| * xserver libX11 libxcb mesa git update 15 Mar 2011marha2011-03-151-1441/+1434
* | Synchronised again with released versionmarha2011-03-141-3/+3
* | svn merge ^/branches/released .marha2011-03-041-4/+4
|\|
| * xserver xkeyboard-config mesa git update 4 Marc 2011marha2011-03-041-1441/+1441
* | svn merge "^/branches/released" .marha2010-11-151-5/+8
|\|
| * xserver pixman libX11 libXext 14/11/2010marha2010-11-141-5/+8
* | svn merge ^/branches/released .marha2010-09-111-0/+1
|\|
| * xserver git update 11/9/2010marha2010-09-111-0/+1
* | svn merge ^/branches/released .marha2010-08-181-33/+62
|\|
| * libxext libx11 libxcb libXinerama libXau pixman xserver git update 18/10/2010marha2010-08-181-32/+61
* | svn merge ^/branches/released .marha2010-07-021-7/+12
|\|
| * git update 2/7/2010marha2010-07-021-7/+12
* | svn merge ^/branches/released .marha2010-07-011-0/+10
|\|
| * git update 1/7/2010marha2010-07-011-0/+10
* | svn merge ^/branches/released .marha2010-06-111-3/+7
|\|
| * xserver git update 11/6/2010marha2010-06-111-3/+7
| * xserver git update 15/5/2010marha2010-05-151-1389/+1389
| * xserver git update 19/4/2010marha2010-04-191-13/+84
* | svn merge -r588:HEAD ^/branches/released .marha2010-05-161-3/+3
* | svn merge -r537:HEAD "^/branches/released" .marha2010-04-191-13/+85
* | svn merge ^/branches/released .marha2010-02-051-19/+19
|\|
| * Git update 5/2/2010marha2010-02-051-19/+19
* | svn merge ^/branches/released .marha2010-01-251-4/+3
|\|