aboutsummaryrefslogtreecommitdiff
path: root/X11
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2013-11-0812-43/+1275
|\ | | | | | | | | | | | | | | | | | | | | | | * origin/released: Added presentproto-1.0 libxtrans libxcb xcb-proto mesa git update 8 nov 2013 Conflicts: X11/xtrans/Xtransint.h X11/xtrans/Xtranssock.c libxcb/src/.gitignore mesalib/src/mesa/drivers/dri/common/dri_util.c
| * Added presentproto-1.0marha2013-11-084-0/+1087
| |
| * libxtrans libxcb xcb-proto mesa git update 8 nov 2013marha2013-11-087-28/+175
| | | | | | | | | | | | | | libxcb commit e8663a935890ff366f49e356211049dfd0d9756a libxcb/xcb-proto commit 29beba6bf02bda86a5b163ace63e1d0a4d3eee5b libxtrans commit 0153d1670e4a1883e1bb6dd971435d6268eac5ba mesa commit 035cce83f7b3d9a037c9e7cc17a212d6cf7e927f
* | Solved compilation and link problems after last mergemarha2013-11-082-20/+25
| |
* | Merge remote-tracking branch 'origin/released'marha2013-11-072-1/+43
|\| | | | | | | | | | | | | | | * origin/released: xextproto fontconfig libxcb mesa xserver git update 7 Nov 2013 Conflicts: xorg-server/include/servermd.h
| * xextproto fontconfig libxcb mesa xserver git update 7 Nov 2013marha2013-11-072-1/+43
| | | | | | | | | | | | | | | | | | xserver commit ab4b1fb38a61feb73d8336cc7a3399eb9d3d25be libxcb commit e4e0c6eec861f4c69da12060dc8dbe7a63fa5eb6 libxcb/xcb-proto commit 530817c5a926f006d8d61f9dcfd9ab73269a9805 xextproto commit 3f355f138d6df57e067458a20f47307883048adb fontconfig commit a4443e64c89256087d40462cfbb482950873e366 mesa commit 110009302bddb4c42a5b3ed5ca451d6bb50a06a0
* | Merge remote-tracking branch 'origin/released'marha2013-11-075-28/+254
|\| | | | | | | | | | | | | | | | | * origin/released: libxtrans fontconfig mesa xserver pixman xkbcomp git update 4 nov 2013 Conflicts: xorg-server/Xext/shm.c xorg-server/os/xstrans.c
| * libxtrans fontconfig mesa xserver pixman xkbcomp git update 4 nov 2013marha2013-11-045-28/+254
| | | | | | | | | | | | | | | | | | xserver commit 33c85beed521c9db140cadd8c5aa9992398ee1fe xkbcomp commit e3e6e938535532bfad175c1635256ab7fb3ac943 pixman commit 8cbc7da4e525c96a8e089e4c1baee75dc8315218 libxtrans commit 1fb0fd555a16dd8fce4abc6d3fd22b315f46762a fontconfig commit 767108aa1327cf0156dfc6f024dbc8fb783ae067 mesa commit 2f896627175384fd5943f21804700a155ba4e8a0
* | Merge remote-tracking branch 'origin/released'marha2013-10-0113-432/+593
|\| | | | | | | | | | | | | | | | | | | | | | | * origin/released: Update following packages: Conflicts: X11/Xwinsock.h apps/xhost/xhost.c libXaw/src/Vendor.c libXfont/include/X11/fonts/bdfint.h libXfont/src/fontfile/catalogue.c
| * Update following packages:marha2013-10-0113-432/+593
| | | | | | | | | | | | | | | | | | | | | | libXpm-3.5.11 libXaw-1.0.12 libXfont-1.4.6 libXrender-0.9.8 xproto-7.0.24 inputproto-2.3 xclock-1.0.7 xhost-1.0.6
* | Solved compiler warningsmarha2013-09-114-6/+5
| |
* | synchronisedmarha2013-08-271-191/+192
| |
* | Solved runtime problems when compiled for 64-bit1.14.2.1marha2013-07-262-325/+325
| |
* | Synchronised filemarha2013-07-121-28/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2013-07-121-1/+1
|\| | | | | | | | | * origin/released: libxtrans fontconfig mesa xserver git update 12 Jul 2013
| * libxtrans fontconfig mesa xserver git update 12 Jul 2013marha2013-07-121-1/+1
| | | | | | | | | | | | | | xserver commit 59a6d3f1eb03010ab831b32b03706a1d6143c732 libxtrans commit f6a161f2a003f4da0a2e414b4faa0ee0de0c01f0 fontconfig commit 338ffe6b886ad4ba86ff471cb59c4a5e5ffbe408 mesa commit 1b0d6aef03161eff4c9933548e964fec1258ea44
* | Synchronised filesmarha2013-07-013-8/+19
| |
* | Synchronised filemarha2013-03-191-2/+17
| |
* | Synchronised filesmarha2013-03-042-62/+7
| |
* | Merge remote-tracking branch 'origin/released'marha2013-01-311-205/+360
|\| | | | | | | | | * origin/released: libxtrans mesa pixman xkeyboard-config git update 31 jan 2013
| * libxtrans mesa pixman xkeyboard-config git update 31 jan 2013marha2013-01-311-205/+360
| | | | | | | | | | | | | | libxtrans: bd53f4c8543faf910a7a151241ee07661b4d57ad mesa: a527b2192e3cb4a68af927ab405e38181d2fcf75 pixman: 958bd334b3c17f529c80f2eeef4224f45c62f292 xkeyboard-config: 46cfd7a3b5c6b6e00648407bd4c0dd56ae86d65a
* | Merge remote-tracking branch 'origin/released'marha2013-01-162-2/+3
|\| | | | | | | | | | | | | * origin/released: Switched to xcalc-1.0.5 Switched to bdftopcf-1.0.4 libxtrans fontconfig glproto libX11 libXau libXext libXft libXinerama libXmu libfontenc mesa xkeyboard-config
| * libxtrans fontconfig glproto libX11 libXau libXext libXft libXineramamarha2013-01-162-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libXmu libfontenc mesa xkeyboard-config libxtrans: d9f3728ff74ceb956f6cf8dc24b38611f9a4868a fontconfig: ec5ca08c807585a9230f83c95f7cca6b7065b142 glproto: 8e3407e02980d088e20041e79bdcdd3737e7827e libX11: f57fd760cba92ad846917f21e94e73e9c846185f libXau: 1a8a1b2c68967b48c07b56142799b1020f017027 libXext: 8eee1236041d46a21faba32e0d27c26985267d89 libXft: c5e760a239afc62a1c75e0509868e35957c8df52 libXinerama: 470b9356af961ff7d3968b164aa73872b49a5dcc libXmu: 474d22468c90f99104873b4c5fd7b0f0d2cbf823 libfontenc: 0c3518df24192f18f15ce91c2868560a5973a3dc mesa: 3c00a52f7e02007f40fa53a06fad517bed0328ff xkeyboard-config: 8a117fbd4a029b952afcfe362931628dccf496e4
* | Synchronised filesmarha2013-01-145-3182/+3230
| |
* | Merge remote-tracking branch 'origin/released'marha2013-01-145-1426/+10
|\| | | | | | | | | | | | | | | * origin/released: libxtrans xwininfo libX11 libXau libXmu libXdmcp mesa mkfontscale xkeyboard-config git update 14 jan 2013 Conflicts: mesalib/src/glsl/glcpp/.gitignore
| * libxtrans xwininfo libX11 libXau libXmu libXdmcp mesa mkfontscalemarha2013-01-145-1426/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | xkeyboard-config git update 14 jan 2013 libxtrans: ec3136232f7ce930f9ca812b6ab42a71b60af4af xwininfo: 3e60a26559221e561770710a8c4ed0b8ebc31afb libX11: 3cd974b1d4d1fa6389d3695fa9fcc0c22a51d50c libXau: 8570d287396934f26224c76d48d7f17d87380e72 libXmu: 9b253d99d5b4f3fbb681c2cb1b84f8f9acfee528 libXdmcp: ca65a92405500393f09d34388edbbf6350e6c146 mesa: e3e1ffb2520498584ef402213d0c8aa4303a46a3 mkfontscale: 1157b3039551b552b483f05f6a411e57941a87c0
* | Solved some more problems due to latest mergemarha2013-01-071-137/+149
| |
* | Merge remote-tracking branch 'origin/released'marha2013-01-072-5/+61
|\| | | | | | | | | * origin/released: Switched to inputproto 2.2.99.1
| * Switched to inputproto 2.2.99.1marha2013-01-072-5/+61
| |
* | Merge remote-tracking branch 'origin/released'marha2012-11-1934-4838/+4838
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-1934-4838/+4838
| |
* | Merge remote-tracking branch 'origin/released'marha2012-10-041-45/+66
|\| | | | | | | | | * origin/released: randrproto mesa pixman git update 4 oct 2012
| * randrproto mesa pixman git update 4 oct 2012marha2012-10-041-45/+66
| | | | | | | | | | | | randrproto: 4fcbd8584e55ff789522a38a41a33c34446d1455 mesa: 185d6df3c10a7ff5defe163af614bfc41088910b pixman: 2e17b6dd4ee7c32684fb7ffc70d3ad3ebf7cb2ef
| * randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xservermarha2012-08-311-3/+4
| | | | | | | | git update 31 Aug 2012
* | randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xservermarha2012-09-041-3/+4
| | | | | | | | git update 31 Aug 2012
* | Merge remote-tracking branch 'origin/released'marha2012-07-131-6/+30
|\| | | | | | | | | | | Conflicts: xorg-server/glx/glxext.c xorg-server/hw/xwin/InitOutput.c
| * xserver mesa git update 13 Jul 2012marha2012-07-131-6/+30
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-063-6/+783
|\| | | | | | | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c xorg-server/dix/privates.c xorg-server/hw/kdrive/ephyr/ephyr.c xorg-server/hw/kdrive/src/kinput.c
| * randrproto fontconfig mesa xserver git update 6 Jul 2012marha2012-07-063-6/+783
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-283-388/+4
|\|
| * xkeyboard-config mesa fontconfig randrproto git update 28 Jun 2012marha2012-06-283-388/+4
| |
* | libXmu is now a dllmarha2012-06-271-13/+16
| | | | | | | | | | Exported variables in libX11 and libxcb should be declared with __declspec(dllimport)
* | Synchronised filesmarha2012-06-2157-8074/+8074
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-0833-3938/+4106
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0833-3938/+4106
| |
* | Added possibility to overrule bind retry countmarha2012-05-021-1/+5
| |
* | Synchronisedmarha2012-04-301-1/+1
| |
* | Synchronised filesmarha2012-04-106-23/+12
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-1019-1390/+7837
|\|
| * Updated following packages:marha2012-04-1019-1390/+7837
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bigreqsproto-1.1.2 fontsproto-2.1.2 recordproto-1.14.2 scrnsaverproto-1.2.2 xcmiscproto-1.2.2 libXt-1.1.3 xhost-1.0.5 kbproto-1.0.6 libXrender-0.9.7 libxkbfile-1.0.8 freetype-2.4.9 libXaw-1.0.10 libXpm-3.5.10 xproto-7.0.23