aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config/rules/base.xml.in
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-06-091-0/+28
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/include/GL/internal/dri_interface.h mesalib/src/gallium/auxiliary/util/u_math.h mesalib/src/mapi/glapi/gen/Makefile mesalib/src/mapi/glapi/gen/gl_table.py mesalib/src/mesa/SConscript mesalib/src/mesa/main/dlist.c mesalib/src/mesa/main/es_generator.py mesalib/src/mesa/main/imports.h mesalib/src/mesa/main/teximage.c mesalib/src/mesa/main/uniforms.c mesalib/src/mesa/state_tracker/st_draw.c mesalib/src/mesa/state_tracker/st_program.c mesalib/src/mesa/vbo/vbo_save_api.c xorg-server/xkeyboard-config/configure.in xorg-server/xkeyboard-config/rules/Makefile.am xorg-server/xkeyboard-config/rules/base.xml.in xorg-server/xkeyboard-config/symbols/cz xorg-server/xkeyboard-config/symbols/in
| * mesa xkbcomp xkeyboard-config git update 9 Jun 2011marha2011-06-091-0/+28
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-051-6/+1
|\| | | | | | | | | | | | | | | | | | | Conflicts: libX11/specs/i18n/trans/trans.xml mesalib/src/glsl/glsl_parser_extras.cpp mesalib/src/glsl/ir_print_visitor.cpp xorg-server/xkeyboard-config/rules/base.xml.in xorg-server/xkeyboard-config/rules/xkb.dtd xorg-server/xkeyboard-config/symbols/de
| * libX11 libXext libXmu mesa xkeyboard-config git update Jun 2011marha2011-06-051-6/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-031-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/configs/linux-dri mesalib/src/gallium/auxiliary/util/u_math.h mesalib/src/mapi/glapi/gen/Makefile mesalib/src/mapi/glapi/glapi_mapi_tmp.h mesalib/src/mapi/glapi/glapi_sparc.S mesalib/src/mapi/glapi/glapi_x86-64.S mesalib/src/mapi/glapi/glapi_x86.S mesalib/src/mapi/glapi/glapitable.h mesalib/src/mapi/glapi/glapitemp.h mesalib/src/mapi/glapi/glprocs.h mesalib/src/mesa/drivers/dri/Makefile.template mesalib/src/mesa/main/dd.h mesalib/src/mesa/main/fbobject.c mesalib/src/mesa/main/remap_helper.h mesalib/src/mesa/main/shaderapi.c mesalib/src/mesa/main/teximage.c mesalib/src/mesa/main/uniforms.c mesalib/src/mesa/state_tracker/st_format.c mesalib/src/mesa/vbo/vbo_exec_array.c xorg-server/configure.ac xorg-server/dix/main.c xorg-server/dix/window.c xorg-server/hw/xquartz/GL/indirect.c xorg-server/hw/xquartz/X11Application.m xorg-server/hw/xquartz/darwin.c xorg-server/hw/xquartz/darwin.h xorg-server/hw/xquartz/mach-startup/Makefile.am xorg-server/hw/xquartz/pbproxy/app-main.m xorg-server/hw/xquartz/pbproxy/pbproxy.h xorg-server/hw/xquartz/pbproxy/x-selection.m xorg-server/hw/xquartz/xpr/xpr.h xorg-server/hw/xquartz/xpr/xprEvent.c xorg-server/hw/xquartz/xpr/xprScreen.c xorg-server/include/privates.h xorg-server/include/protocol-versions.h xorg-server/test/Makefile.am xorg-server/xfixes/cursor.c xorg-server/xfixes/xfixes.c xorg-server/xkeyboard-config/configure.in xorg-server/xkeyboard-config/rules/base.extras.xml.in xorg-server/xkeyboard-config/rules/base.xml.in xorg-server/xkeyboard-config/symbols/de xorg-server/xkeyboard-config/symbols/lk xorg-server/xkeyboard-config/symbols/ru
| * xserver xkeyboard-config mesa git update 3 Jun 2011marha2011-06-031-3/+3
| |
* | Merge remote-tracking branch 'origin/released'marha2011-05-291-10/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libX11/specs/libX11/CH08.xml mesalib/src/mesa/main/dlist.c mesalib/src/mesa/main/fbobject.c mesalib/src/mesa/main/queryobj.c mesalib/src/mesa/main/shaderapi.c mesalib/src/mesa/main/teximage.c mesalib/src/mesa/program/ir_to_mesa.cpp mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c mesalib/src/mesa/state_tracker/st_cb_drawpixels.c mesalib/src/mesa/state_tracker/st_cb_readpixels.c mesalib/src/mesa/state_tracker/st_cb_texture.c mkfontscale/list.h pixman/pixman/Makefile.win32 xorg-server/dix/devices.c xorg-server/dix/events.c xorg-server/dix/inpututils.c xorg-server/fb/fbbltone.c xorg-server/hw/kdrive/ephyr/ephyr.c xorg-server/hw/kdrive/ephyr/ephyrinit.c xorg-server/hw/xfree86/common/xf86Module.h xorg-server/hw/xfree86/common/xf86Xinput.c xorg-server/hw/xfree86/man/xorg.conf.man xorg-server/hw/xwin/winkeybd.c xorg-server/hw/xwin/winmouse.c xorg-server/include/input.h xorg-server/include/inputstr.h xorg-server/mi/mieq.c xorg-server/randr/rrscreen.c xorg-server/xkeyboard-config/rules/base.extras.xml.in xorg-server/xkeyboard-config/rules/base.xml.in
| * libX11 mesa mkfontscale pixman xserver git update 29 Mar 2011marha2011-05-291-10/+0
| |
* | merge ^/branches/released .marha2011-05-181-6/+6
|\|
| * xkeyboard-config libX11 pixman mesa git update 18 May 2011marha2011-05-181-6/+6
| |
* | merge ^/branches/released .marha2011-05-161-0/+97
|\|
| * xserver xkeyboar-config mesa git update 16 May 2011marha2011-05-161-0/+97
| |
* | svn merge ^/branches/released .marha2011-05-031-0/+7
|\|
| * xkeyboard libxcb pixman mesa git update 2 May 2011marha2011-05-031-0/+7
| |
* | svn merge ^/branches/released .marha2011-04-281-4/+4
|\|
| * xserver xkeyboard-config mesa git update 28 Apr 2011marha2011-04-281-4/+4
| |
* | svn merge ^/branches/released .marha2011-04-151-14/+0
|\|
| * xserver xkeyboard-config libX11 mesa git update 15 April 2011marha2011-04-151-14/+0
| |
* | svn merge ^/branches/released .marha2011-04-131-48/+69
|\|
| * xkeyboard-config libxcb libX11 git update 13 April 2011marha2011-04-131-48/+69
| |
* | svn merge ^/branches/released .marha2011-04-071-1/+1
|\|
| * xserver pixman mesa git update 7 Apr 2011marha2011-04-071-1/+1
| |
* | svn merge ^/branches/released .marha2011-04-051-139/+63
|\|
| * xserver xkeyboard-config libxcb xkbcomp mesa git update 5 Apr 2011marha2011-04-051-139/+63
| |
* | svn merge ^/branches/released .marha2011-03-281-570/+658
|\|
| * xserver xkeyboard-config mesa git update 28 Mar 2011marha2011-03-281-570/+658
| |
* | svn merge ^/branches/released .marha2011-03-241-2/+2
|\|
| * xserver xkeyboard-config libX11 pixman mesa git update 24 Mar 2011marha2011-03-241-6209/+6209
|/
* xkeyboard-config libxcb pixman mesalib git update 13 Mar 2011marha2011-03-131-6202/+6209
|
* xkeyboard-config mesa git update 8 Mar 2011marha2011-03-081-6195/+6202
|
* xserver libxcb mesa git update 5 Mar 2011marha2011-03-051-6155/+6195
|
* xkeyboard-config mesa git update 2 Mar 2011marha2011-03-021-664/+1047
|
* xserver libX11 Xextproto mesa Git update 28 Feb 2011marha2011-02-281-2/+8
|
* xserver pixman mesa git update 23 Feb 2011marha2011-02-231-5766/+5766
|
* xserver xkeyboard-config libX11 pixman mesa git update 2011marha2011-02-201-1/+18
|
* xkeyboard-config pixman xkbcompt mesa git update 12 Feb 2011marha2011-02-121-0/+6
|
* xkeyboard-config libX11 mesalib git update 12 jan 2011marha2011-01-121-1/+1
|
* xkeyboard-config git update 27/12/2010marha2010-12-271-5736/+5743
|
* xserver libX11 libXdmcp pixman git update 22-12-2010marha2010-12-221-5726/+5736
|
* xkeyboard-config update 16/11/2010marha2010-11-161-0/+6
|
* xserver pixman libX11 libXext 14/11/2010marha2010-11-141-0/+157
|
* xserver libX11 xkeyboard-config git update 30/9/2010marha2010-09-301-5/+18
|
* xkeyboard-config git update 6/9/2010marha2010-09-061-0/+28
|
* xserver xkeyboard-config git update 21/8/2010marha2010-08-221-5/+12
|
* Renamed xkbdata.src to xkeyboard-config (to reflect the name in the git ↵marha2010-07-131-0/+5515
repository)