aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config/keycodes
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-06-0819-3724/+3724
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: fontconfig/.gitignore libX11/src/ConvSel.c libX11/src/CrGlCur.c libX11/src/CrWindow.c libX11/src/GetDflt.c libX11/src/Window.c libX11/src/xlibi18n/XimProto.h libX11/src/xlibi18n/lcDynamic.c libxcb/src/.gitignore libxcb/src/xcb_ext.c libxcb/src/xcb_xid.c mesalib/src/glsl/.gitignore mesalib/src/glsl/glcpp/.gitignore mesalib/src/mapi/glapi/gen/glX_API.xml mesalib/src/mapi/glapi/glapi_getproc.c mesalib/src/mesa/main/.gitignore mesalib/src/mesa/main/syncobj.c mesalib/src/mesa/program/.gitignore xkbcomp/listing.c xkbcomp/xkbpath.c xorg-server/.gitignore xorg-server/Xext/xvmain.c xorg-server/dix/dispatch.c xorg-server/hw/xwin/glx/winpriv.h xorg-server/hw/xwin/winprefsyacc.y xorg-server/hw/xwin/winscrinit.c xorg-server/xkeyboard-config/rules/bin/ml1_s.sh xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh xorg-server/xkeyboard-config/rules/bin/ml_s.sh xorg-server/xkeyboard-config/rules/bin/mlv_s.sh xorg-server/xkeyboard-config/rules/compat/.gitignore
| * Used synchronise script to update filesmarha2012-06-0819-3724/+3724
| |
* | Synchronised line endinge with release branchmarha2011-09-121-410/+410
| |
* | merge ^/branches/released .marha2011-05-251-1/+4
|\|
| * xkeyboard-config libX11 pixman mesa git update 25 May 2011marha2011-05-251-407/+410
| |
* | svn merge ^/branches/released .marha2011-02-2016-3850/+3810
|\|
| * xserver xkeyboard-config libX11 pixman mesa git update 2011marha2011-02-2016-3850/+3810
| |
* | svn merge ^/branches/released .marha2011-01-111-8/+4
|\|
| * xkeyboard-config git update 11 jan 2011marha2011-01-111-8/+4
| |
| * Renamed xkbdata.src to xkeyboard-config (to reflect the name in the git ↵marha2010-07-1322-0/+4202
| | | | repository)
* Renamed xkbdata.src also on trunk since the current merging of subversion ↵marha2010-07-1325-0/+4259
will loose all the changes in xkbdata.src when the directory is renamed on the source branch.