aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config/rules/base.o_s.part
Commit message (Collapse)AuthorAgeFilesLines
* Synchronised line endinge with release branchmarha2011-09-121-144/+144
|
* Merge remote-tracking branch 'origin/released'marha2011-08-081-4/+5
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mesa/main/mtypes.h mesalib/src/mesa/main/shaderapi.c mesalib/src/mesa/program/ir_to_mesa.cpp mesalib/src/mesa/program/prog_optimize.c mesalib/src/mesa/state_tracker/st_cb_blit.c xorg-server/xkeyboard-config/rules/base.o_s.part xorg-server/xkeyboard-config/rules/base.xml.in
| * mesa xkeyboard-config git update 8 aug 2011marha2011-08-081-4/+5
| |
* | svn merge ^/branches/released .marha2011-02-281-0/+1
|\|
| * xserver libX11 Xextproto mesa Git update 28 Feb 2011marha2011-02-281-142/+143
|/
* xkeyboard-config pixman xkbcompt mesa git update 12 Feb 2011marha2011-02-121-0/+1
|
* xkeyboard-config update 16/11/2010marha2010-11-161-0/+1
|
* xserver pixman libX11 libXext 14/11/2010marha2010-11-141-0/+1
|
* xserver libX11 xkeyboard-config git update 30/9/2010marha2010-09-301-0/+1
|
* Renamed xkbdata.src to xkeyboard-config (to reflect the name in the git ↵marha2010-07-131-0/+138
repository)