aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkeyboard-config/rules
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-10-081-0/+6
|\ | | | | | | | | | | | | | | | | | | | | * origin/released: pixman libxcb mesa xserver xkeyboard-config git update 8 oct 2012 Conflicts: xorg-server/Xext/xf86bigfont.c xorg-server/dix/dispatch.c xorg-server/include/dixstruct.h xorg-server/os/connection.c
| * pixman libxcb mesa xserver xkeyboard-config git update 8 oct 2012marha2012-10-081-0/+6
| | | | | | | | | | | | | | | | xserver: 09f1e5b15b769e1122f0a8d7cae0820038992312 libxcb: 4ffe54f69049e6792a35a287fd9ff83abbd4fd8d mesa: 86de501f14f11f1e993c8703c0d69bdf1f6c7835 xkeyboard-config: 0a21bb5a28018902a6252fccb620d7dff7e67175 pixman: 3d81d89c292058522cce91338028d9b4c4a23c24
* | Merge remote-tracking branch 'origin/released'marha2012-10-011-0/+13
|\| | | | | | | | | | | | | | | * origin/released: libxcb mesa pixman xkeyboard-config git update 1 oct 2012 Conflicts: libxcb/src/man/.gitignore
| * libxcb mesa pixman xkeyboard-config git update 1 oct 2012marha2012-10-011-0/+13
| | | | | | | | | | | | | | libxcb: 23911a707b8845bff52cd7853fc5d59fb0823cef mesa: c321b1bef15e2807de3f6225c4abcbf48969997a pixman: 183afcf1d95625a1f237ef349a1c8931d94d000d xkeyboard-config: 159e8db2a3829a11801d06cc6cad6d1378551dd5
* | Merge remote-tracking branch 'origin/released'marha2012-09-141-0/+5
|\|
| * fontconfig libX11 mesa xkeyboard-config git update 14 sep 2012marha2012-09-141-0/+5
| |
| * randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xservermarha2012-08-311-0/+18
| | | | | | | | git update 31 Aug 2012
* | randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xservermarha2012-09-041-0/+18
| | | | | | | | git update 31 Aug 2012
* | Merge remote-tracking branch 'origin/released'marha2012-07-311-0/+6
|\|
| * fontconfig libXext mesa xserver pixman git update 31 Jul 2012marha2012-07-311-0/+6
| |
* | The following libraries have no xserver dependent compilation anymoremarha2012-06-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libX11 libxcb pixman libXdmcp libXau libXfont libXfont libXfont libXfont libXfont libXfont libXfont libfontenc libXinerama
* | Merge remote-tracking branch 'origin/released'marha2012-06-0833-374/+374
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0834-397/+403
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-091-0/+6
|\|
| * libX11 mesa xserver xkeyboard-configmarha2012-05-091-0/+6
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-101-0/+17
|\| | | | | | | | | Conflicts: xorg-server/os/log.c
| * fontconfig mesa xkeyboard-config xserver pixman git update 10 Apr 2012marha2012-04-101-0/+17
| |
* | Merge remote-tracking branch 'origin/released'marha2012-03-281-0/+6
|\|
| * xkeyboard-config pixman fontconfig mesa git update 28 Mar 2012marha2012-03-281-0/+6
| |
* | Merge remote-tracking branch 'origin/released'marha2012-03-261-0/+10
|\|
| * fontconfig libxcb mesa xkeyboard-config git update 26 Mar 2012marha2012-03-261-0/+10
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-202-0/+7
|\|
| * xserver xkeyboard-config git update 20 jan 2012marha2012-01-202-0/+7
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-091-1/+51
|\|
| * xwininfo libX11 mesa mkfontscale xkeyboard-config git update 9 jan 2011marha2012-01-091-1/+51
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-292-5/+18
|\|
| * xserver libX11 mesa xkeyboard-config git update 28 dec 2011marha2011-12-282-5/+18
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-231-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/glx/dispatch.h xorg-server/glx/glapi.c xorg-server/glx/indirect_dispatch.h xorg-server/glx/indirect_reqsize.c xorg-server/glx/indirect_reqsize.h xorg-server/glx/indirect_size.h xorg-server/glx/indirect_size_get.c xorg-server/glx/indirect_size_get.h xorg-server/glx/indirect_table.c xorg-server/mi/mieq.c
| * git mesa pixman xserver xkeyboard-config update 24 dec 2011marha2011-12-231-3/+3
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-051-1/+0
|\| | | | | | | | | Conflicts: xorg-server/dix/dispatch.c
| * xserver xkeyboard-config mesa git update 5 dec 2011marha2011-12-051-1/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-182-0/+8
|\|
| * xkeyboard-config mesa git update 18 nov 2011marha2011-11-182-0/+8
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-191-1/+3
|\| | | | | | | | | Conflicts: xorg-server/include/os.h
| * libX11 libXext libXft mesa libxcb mkfontscale pixman xservermarha2011-10-191-1/+3
| | | | | | | | xkeyboard-config git update 19 oct 2011
* | Merge remote-tracking branch 'origin/released'marha2011-10-101-75/+255
|\|
| * fontconfig libX11 mesa pixman xkeyboard-config git updte 10 oct 2011marha2011-10-101-75/+255
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-301-7/+7
|\| | | | | | | | | Conflicts: openssl/Makefile
| * mesa xkeyboard-config git update 30 sep 2011marha2011-09-301-7/+7
| |
* | Synchronised line endinge with release branchmarha2011-09-129-7511/+7511
| |
* | Merge remote-tracking branch 'origin/released'marha2011-08-082-11/+18
|\| | | | | | | | | | | | | | | | | | | | | 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-082-11/+18
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-132-1/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-132-1/+11
| | | | | | | | update 13 Jun 2011
* | Merge remote-tracking branch 'origin/released'marha2011-06-101-8/+0
|\| | | | | | | | | | | Conflicts: xorg-server/xkeyboard-config/configure.in xorg-server/xkeyboard-config/rules/Makefile.am
| * xwininfo xkeyboard-config git update 10 juni 2011marha2011-06-101-8/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-092-0/+36
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-092-0/+36
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-052-7/+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-052-7/+5
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-12 02:31:18 +0000