aboutsummaryrefslogtreecommitdiff
path: root/libxcb
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-11-191-4/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | * origin/released: git update 19 nov 2012 Added bash script to update released branch Conflicts: mesalib/src/mapi/glapi/gen/gl_API.xml mesalib/src/mesa/program/.gitignore pixman/pixman/pixman-mmx.c xorg-server/Xi/xiquerypointer.c xorg-server/xkb/xkb.c
| * git update 19 nov 2012marha2012-11-191-4/+4
| | | | | | | | | | | | | | | | | | fontconfig: c20ac78b01df3f0919352bba16b5b48b3b5d4d6d libxcb: 76a2166de9c80b35f987fdc3f3a228bafa0de94e mesa: ddb901fbf4489ffcd85d3320f23913eb1d4fbdfe pixman: 44dd746bb68625b2f6be77c3f80292b45defe9d7 xserver: 6a6c3afe71ac82a93d9fd0034dd5bbdcf0eae1ea xkeyboard-config: 709e05c069428236ca2567e784c9971eecc8ca50
* | Merge remote-tracking branch 'origin/released'marha2012-11-1975-13282/+13282
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/released: Changed file permissions dos -> unix Conflicts: libX11/include/X11/Xregion.h libX11/src/ConvSel.c libX11/src/CrGlCur.c libX11/src/CrWindow.c libX11/src/GetDflt.c libX11/src/StrKeysym.c libX11/src/Window.c libX11/src/xkb/XKBBind.c libX11/src/xkb/XKBGetMap.c libX11/src/xkb/XKBSetGeom.c libX11/src/xkb/XKBUse.c libX11/src/xlibi18n/XimProto.h libX11/src/xlibi18n/lcDynamic.c libXdmcp/Key.c libXdmcp/Write.c libxcb/src/xcb_windefs.h xkbcomp/keycodes.c xkbcomp/xkbpath.c xorg-server/hw/xwin/glx/winpriv.h 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/mln_s.sh xorg-server/xkeyboard-config/rules/bin/mlnvn_s.sh xorg-server/xkeyboard-config/rules/bin/mlv_s.sh xorg-server/xkeyboard-config/rules/compat/.gitignore
| * dos -> unixmarha2012-11-1975-13269/+13269
| |
* | Merge remote-tracking branch 'origin/released'marha2012-10-085-3/+23
|\| | | | | | | | | | | | | | | | | | | | | * 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-085-3/+23
| | | | | | | | | | | | | | | | xserver: 09f1e5b15b769e1122f0a8d7cae0820038992312 libxcb: 4ffe54f69049e6792a35a287fd9ff83abbd4fd8d mesa: 86de501f14f11f1e993c8703c0d69bdf1f6c7835 xkeyboard-config: 0a21bb5a28018902a6252fccb620d7dff7e67175 pixman: 3d81d89c292058522cce91338028d9b4c4a23c24
* | Merge remote-tracking branch 'origin/released'marha2012-10-012-3/+15
|\| | | | | | | | | | | | | | | * 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-012-2/+15
| | | | | | | | | | | | | | libxcb: 23911a707b8845bff52cd7853fc5d59fb0823cef mesa: c321b1bef15e2807de3f6225c4abcbf48969997a pixman: 183afcf1d95625a1f237ef349a1c8931d94d000d xkeyboard-config: 159e8db2a3829a11801d06cc6cad6d1378551dd5
* | Merge remote-tracking branch 'origin/released'marha2012-09-202-1/+13
|\| | | | | | | | | | | | | | | * origin/released: libxcb xserver pixman mesa git update 20 sep 2012 Conflicts: libxcb/src/xcb_conn.c
| * libxcb xserver pixman mesa git update 20 sep 2012marha2012-09-202-1/+13
| | | | | | | | | | | | | | libxcb: 08cc068ead7b8e678cdb119b38ada5261d5cc3ea xserver: 70e5766874a919039678bb2ed75f2ccea0cb4345 pixman: 3124a51abb89475b8c5045bc96e04c5852694a16 mesa: bd8fb9e80562fbe0ff76cae50fc411635096f3a9
| * randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xservermarha2012-08-3110-326/+382
| | | | | | | | git update 31 Aug 2012
| * xwininfo fontconfig libX11 libXau libXext libxcb mesa pixmanmarha2012-08-271-1/+1
| | | | | | | | xkeyboard-config git update 27 Aug 2012
* | Added missing exported functionmarha2012-09-041-0/+1
| |
* | randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xservermarha2012-09-0410-330/+386
| | | | | | | | git update 31 Aug 2012
* | xwininfo fontconfig libX11 libXau libXext libxcb mesa pixmanmarha2012-09-041-1/+1
| | | | | | | | xkeyboard-config git update 27 Aug 2012
* | Merge remote-tracking branch 'origin/released'marha2012-08-161-1/+5
|\|
| * libxcb xserver mesa git update 16 Aug 2012marha2012-08-161-1/+5
| |
* | Solved compile problems when compiled from a clean treemarha2012-06-271-1/+1
| |
* | extern -> XCB_EXTERNmarha2012-06-271-1/+1
| |
* | libXmu is now a dllmarha2012-06-273-1/+8
| | | | | | | | | | Exported variables in libX11 and libxcb should be declared with __declspec(dllimport)
* | libxcb is now a dllmarha2012-06-262-2/+72
| |
* | libX11 is now compiled as dllmarha2012-06-261-0/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-221-12/+36
|\| | | | | | | | | Conflicts: mesalib/src/mapi/glapi/gen/.gitignore
| * mesa xserver libxcb fontconfigmarha2012-06-221-12/+36
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-0880-8602/+8680
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0881-8598/+8705
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-231-1/+1
|\|
| * fontconfig libXau libXext libxcb pixman mesa git update 23 April 2012marha2012-04-231-1/+1
| |
* | Ignore generated .3 files in libxcb/src/man1.12.0.0marha2012-03-301-0/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2012-03-289-465/+4217
|\|
| * fontconfig libxcb xcb-proto mesa xserver git update 27 Mar 2012marha2012-03-279-465/+4217
| |
* | Merge remote-tracking branch 'origin/released'marha2012-03-263-3/+9
|\|
| * fontconfig libxcb mesa xkeyboard-config git update 26 Mar 2012marha2012-03-263-3/+9
| |
* | Merge remote-tracking branch 'origin/released'marha2012-03-122-2/+12
|\| | | | | | | | | | | | | | | 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-122-2/+12
| |
* | Merge remote-tracking branch 'origin/released'marha2012-03-091-12/+2
|\| | | | | | | | | Conflicts: libxcb/src/xcb_in.c
| * libxcb fontconfig pixman mesa git update 9 Mar 2012marha2012-03-091-7/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2012-02-221-0/+5
|\|
| * fontconfig libX11 libxcb mesa pixman xserver git update 22 Feb 2012marha2012-02-221-0/+5
| |
* | Merge remote-tracking branch 'origin/released'marha2012-02-132-2/+4
|\|
| * libX11 libxcb mesa xserver mkfontscale git update 13 feb 2012marha2012-02-133-3/+5
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-301-3/+11
|\|
| * libxcb mesa git update 30 jan 2012marha2012-01-301-3/+11
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-263-216/+0
|\|
| * xwininfo xcb-proto mesa xserver git update 26 12 2012marha2012-01-263-216/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-231-0/+2
|\|
| * git update libX11 mesa libxcb xkeyboard-config 23 jan 2012marha2012-01-231-0/+2
| |
* | Solved compile errorsmarha2012-01-133-5/+3
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-1313-4035/+4184
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: libxcb/src/xcb_auth.c libxcb/src/xcb_conn.c libxcb/src/xcb_out.c libxcb/src/xcb_util.c xorg-server/dix/dispatch.c xorg-server/include/dixstruct.h xorg-server/include/misc.h xorg-server/os/connection.c
| * libxtrans libXdmcp libxcb mesa xserver git update 13 jan 2012marha2012-01-1313-4006/+4155
| |