aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-06-133-1/+38
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: X11/extensions/configure.ac X11/xtrans/configure.ac X11/xtrans/doc/Makefile.am libX11/configure.ac libX11/docbook.am libXdmcp/configure.ac libXdmcp/doc/Makefile.am libXext/configure.ac libXext/docbook.am libXmu/configure.ac libXmu/doc/Makefile.am mesalib/src/mapi/glapi/gen/Makefile mesalib/src/mapi/glapi/glapi.h mesalib/src/mesa/state_tracker/st_draw.c xorg-server/xkeyboard-config/rules/base.extras.xml.in xorg-server/xkeyboard-config/rules/compat/variantsMapping.lst xorg-server/xkeyboard-config/symbols/de
| * libX11 mesa xkeyboard-config libXmu libXext libXdmcp libxtrans x11proto git ↵marha2011-06-133-1/+38
| | | | | | | | update 13 Jun 2011
* | Merge remote-tracking branch 'origin/released'marha2011-06-103-128/+0
|\| | | | | | | | | | | Conflicts: xorg-server/xkeyboard-config/configure.in xorg-server/xkeyboard-config/rules/Makefile.am
| * xwininfo xkeyboard-config git update 10 juni 2011marha2011-06-103-128/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-096-5/+470
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-096-5/+470
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-053-22/+5
|\| | | | | | | | | | | | | | | | | | | 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-053-22/+5
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-037-342/+382
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-037-342/+382
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-0118-20375/+28803
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/xkeyboard-config/NEWS xorg-server/xkeyboard-config/configure.in xorg-server/xkeyboard-config/po/ca.po xorg-server/xkeyboard-config/po/da.po xorg-server/xkeyboard-config/po/de.po xorg-server/xkeyboard-config/po/fr.po xorg-server/xkeyboard-config/po/it.po xorg-server/xkeyboard-config/po/ko.po xorg-server/xkeyboard-config/po/nl.po xorg-server/xkeyboard-config/po/pl.po xorg-server/xkeyboard-config/po/ru.po xorg-server/xkeyboard-config/po/sv.po xorg-server/xkeyboard-config/po/uk.po
| * mesa pixman xkeyboard-config git update 1 Jun 2011marha2011-06-0117-20375/+24995
| |
| * mesa pixman xkeyboard-config git update 1 Jun 2011marha2011-06-011-0/+3808
| |
* | Added gitignore filesmarha2011-05-301-0/+16
| |
* | Merge remote-tracking branch 'origin/released'marha2011-05-292-11/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-292-11/+11
| |
* | merge ^/branches/released .marha2011-05-252-3/+6
|\|
| * xkeyboard-config libX11 pixman mesa git update 25 May 2011marha2011-05-252-2280/+2283
| |
* | Removed change compared to released version. Was causing problem with alt gr ↵marha2011-05-231-1/+1
| | | | | | | | key in belgian keyboard
* | svn merge ^/branches/released .marha2011-05-221-331/+331
|\|
| * xserver xkeyboard-config libX11 randrproto pixman glproto mesa git update 22 ↵marha2011-05-221-331/+331
| | | | | | | | May 2011
* | merge ^/branches/released .marha2011-05-187-1018/+1114
|\|
| * xkeyboard-config libX11 pixman mesa git update 18 May 2011marha2011-05-187-1439/+1535
| |
* | merge ^/branches/released .marha2011-05-166-2/+577
|\|
| * xserver xkeyboar-config mesa git update 16 May 2011marha2011-05-166-216/+791
| |
* | svn merge ^/branches/released .marha2011-05-034-493/+1456
|\|
| * xkeyboard libxcb pixman mesa git update 2 May 2011marha2011-05-034-2/+965
| |
* | svn merge ^/branches/released .marha2011-04-301-2/+2
|\|
| * xserver mesa xkeyboard-config git update 30 Apr 2011marha2011-04-301-311/+311
| |
* | svn merge ^/branches/released .marha2011-04-291-9/+2
|\|
| * xserver mesa git update 28 Apr 2011marha2011-04-291-9/+2
| |
* | svn merge ^/branches/released .marha2011-04-282-5/+5
|\|
| * xserver xkeyboard-config mesa git update 28 Apr 2011marha2011-04-282-5/+5
| |
* | svn merge ^/branches/released .marha2011-04-276-312/+320
|\|
| * xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011marha2011-04-276-58/+66
| |
* | svn merge ^/branches/released .marha2011-04-154-52/+65
|\|
| * xserver xkeyboard-config libX11 mesa git update 15 April 2011marha2011-04-154-52/+65
| |
* | svn merge ^/branches/released .marha2011-04-142-51/+50
|\|
| * server xkeyboard-config mesa git update 14 Apr 2011marha2011-04-142-2/+1
| |
* | svn merge ^/branches/released .marha2011-04-1356-403/+878
|\|
| * xkeyboard-config libxcb libX11 git update 13 April 2011marha2011-04-1356-5940/+6415
| |
* | 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-061-2/+4
|\|
| * xserver libX11 libxcb mesa git update 6 Apr 2011marha2011-04-061-122/+124
| |
* | svn merge ^/branches/released .marha2011-04-0561-36781/+49911
|\|
| * xserver xkeyboard-config libxcb xkbcomp mesa git update 5 Apr 2011marha2011-04-0561-35539/+48669
| |
* | svn merge ^/branches/released .marha2011-03-284-671/+757
|\|
| * xserver xkeyboard-config mesa git update 28 Mar 2011marha2011-03-284-634/+720
| |
* | svn merge ^/branches/released .marha2011-03-251-0/+26
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 09:54:06 +0000