aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config/symbols/macintosh_vndr
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-03-121-76/+68
|\ | | | | | | | | | | | | | | Conflicts: libX11/src/OpenDis.c libX11/src/xcb_io.c xorg-server/xkeyboard-config/keymap/sun_vndr/all.in xorg-server/xkeyboard-config/semantics/default.in
| * xkeyboard-config fontconfig libX11 libXft libxcb mesa git update 12 Mar 2012marha2012-03-121-76/+68
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-191-141/+141
|\| | | | | | | | | Conflicts: xorg-server/include/os.h
| * libX11 libXext libXft mesa libxcb mkfontscale pixman xservermarha2011-10-191-141/+141
| | | | | | | | xkeyboard-config git update 19 oct 2011
* | svn merge ^/branches/released .marha2011-02-2014-877/+849
|\|
| * xserver xkeyboard-config libX11 pixman mesa git update 2011marha2011-02-2014-877/+849
| |
| * Renamed xkbdata.src to xkeyboard-config (to reflect the name in the git ↵marha2010-07-1317-0/+1171
| | | | repository)
* Renamed xkbdata.src also on trunk since the current merging of subversion ↵marha2010-07-1318-0/+1187
will loose all the changes in xkbdata.src when the directory is renamed on the source branch.