aboutsummaryrefslogtreecommitdiff
path: root/libX11/modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2013-07-291-1/+1
|\ | | | | | | | | * origin/released: libX11 mesa xserver git update 29 July 2013
| * libX11 mesa xserver git update 29 July 2013marha2013-07-291-1/+1
| | | | | | | | | | | | xserver commit ff38bbe81ace85bf675bbaa0a9ca5f3b32ede449 libX11 commit 208e586c808e88a2ee819e4450dc27f557afc2bf mesa commit e847b5ae066bf9a209dad482fcc664f944983633
* | Merge remote-tracking branch 'origin/released'marha2013-07-091-28/+0
|\| | | | | | | | | * origin/released: fontconfig libX11 libxcb mesa git update 9 Jul 2013
| * fontconfig libX11 libxcb mesa git update 9 Jul 2013marha2013-07-091-28/+0
| | | | | | | | | | | | | | libxcb commit a1e67b141a57d39cbcaff1a703d6fc0da1fbb56d libX11 commit 383e2b0d029482a0f4c39fe00e15397538576fc1 fontconfig commit 04bd904632b22682c888f658650cdcd322544273 mesa commit 292368570a13501dfa95b1b0dd70966caf6ffc6b
| * xwininfo fontconfig libX11 libXau libXdmcp libXext mesa libXinerama libxcb ↵marha2013-06-043-15/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libxcb/xcb-proto libfontenc pixman xkbcomp mkfontscale xkeyboard-config git update 4 Jun 2013 xserver commit c21344add2fc589df83b29be5831c36a372201bd libxcb commit 9ae84ad187e2ba440c40f44b8eb21c82c2fdbf12 libxcb/xcb-proto commit bdfedfa57a13ff805580cfacafc70f9cc55df363 xkeyboard-config commit dad9ade4e83d1ef5a517fcc4cc9ad3a79b47acce libX11 commit 8496122eb00ce6cd5d2308ee54f64b68c378e455 libXdmcp commit 0b443c1b769b9c9a3b45b4252afe07e18b709ff4 libXext commit d8366afbb0d2e4fbb1e419b1187f490522270bea libfontenc commit 3acba630d8b57084f7e92c15732408711ed5137a libXinerama commit 6e1d1dc328ba8162bba2f4694e7f3c706a1491ff libXau commit 899790011304c4029e15abf410e49ce7cec17e0a xkbcomp commit ed582f4fccd4e23abcfba8b3b03649fea6414f44 pixman commit 2acfac5f8e097ee2ae225d986f981b55d65dd152 mkfontscale commit 19e2cb7c6a3ec2c5b1bc0d24866fa685eef0ee13 xwininfo commit ba0d1b0da21d2dbdd81098ed5778f3792b472e13 fontconfig commit cd9b1033a68816a7acfbba1718ba0aa5888f6ec7 mesa commit 7bafd88c153e395274b632e7eae4bc9fc3aec1d2
* | Solved compilation problemsmarha2013-06-041-1/+1
| |
* | xwininfo fontconfig libX11 libXau libXdmcp libXext mesa libXinerama libxcb ↵marha2013-06-043-15/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libxcb/xcb-proto libfontenc pixman xkbcomp mkfontscale xkeyboard-config git update 4 Jun 2013 xserver commit c21344add2fc589df83b29be5831c36a372201bd libxcb commit 9ae84ad187e2ba440c40f44b8eb21c82c2fdbf12 libxcb/xcb-proto commit bdfedfa57a13ff805580cfacafc70f9cc55df363 xkeyboard-config commit dad9ade4e83d1ef5a517fcc4cc9ad3a79b47acce libX11 commit 8496122eb00ce6cd5d2308ee54f64b68c378e455 libXdmcp commit 0b443c1b769b9c9a3b45b4252afe07e18b709ff4 libXext commit d8366afbb0d2e4fbb1e419b1187f490522270bea libfontenc commit 3acba630d8b57084f7e92c15732408711ed5137a libXinerama commit 6e1d1dc328ba8162bba2f4694e7f3c706a1491ff libXau commit 899790011304c4029e15abf410e49ce7cec17e0a xkbcomp commit ed582f4fccd4e23abcfba8b3b03649fea6414f44 pixman commit 2acfac5f8e097ee2ae225d986f981b55d65dd152 mkfontscale commit 19e2cb7c6a3ec2c5b1bc0d24866fa685eef0ee13 xwininfo commit ba0d1b0da21d2dbdd81098ed5778f3792b472e13 fontconfig commit cd9b1033a68816a7acfbba1718ba0aa5888f6ec7 mesa commit 7bafd88c153e395274b632e7eae4bc9fc3aec1d2
* | Merge remote-tracking branch 'origin/released'marha2013-03-041-82/+9
|\| | | | | | | | | | | | | | | | | * origin/released: fontconfig libX11 mesalib pixman xserver xkeyboard-config git update 4 Mar 2013 Conflicts: libX11/src/xkb/XKBGAlloc.c libX11/src/xkb/XKBMisc.c
| * fontconfig libX11 mesalib pixman xserver xkeyboard-config git update 4 Mar 2013marha2013-03-041-82/+9
| | | | | | | | | | | | | | | | | | xserver commit 8f4640bdb9d3988148e09a08d2c7e3bab1d538d6 xkeyboard-config commit fa2f330df22511c3846cb1cb0760551c6e244a81 libX11 commit c23d61d1b84dca3740bf4786978c7908d0065fb9 pixman commit 5feda20fc39407879993ed4a6d861ef7f78d9432 fontconfig commit 612ee2a5c91b8929b2cc5abce4af84d8d7e66bd0 mesa commit e29124717eae4f8d329bb6a9707b802c0ff4bdd9
* | Merge remote-tracking branch 'origin/released'marha2013-01-141-6/+0
|\| | | | | | | | | | | | | | | * 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-141-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | xkeyboard-config git update 14 jan 2013 libxtrans: ec3136232f7ce930f9ca812b6ab42a71b60af4af xwininfo: 3e60a26559221e561770710a8c4ed0b8ebc31afb libX11: 3cd974b1d4d1fa6389d3695fa9fcc0c22a51d50c libXau: 8570d287396934f26224c76d48d7f17d87380e72 libXmu: 9b253d99d5b4f3fbb681c2cb1b84f8f9acfee528 libXdmcp: ca65a92405500393f09d34388edbbf6350e6c146 mesa: e3e1ffb2520498584ef402213d0c8aa4303a46a3 mkfontscale: 1157b3039551b552b483f05f6a411e57941a87c0
* | Merge remote-tracking branch 'origin/released'marha2012-11-1921-6268/+6268
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-1921-6268/+6268
| |
* | Merge remote-tracking branch 'origin/released'marha2012-11-0723-1531/+1531
|\| | | | | | | | | | | | | | | | | | | | | | | * origin/released: xserver mesa xkbcomp git update 7 nov 2012 Conflicts: mesalib/src/mapi/glapi/gen/glX_API.xml mesalib/src/mesa/main/.gitignore xkbcomp/listing.c xorg-server/hw/xwin/winshaddd.c xorg-server/hw/xwin/winshadddnl.c
| * xserver mesa xkbcomp git update 7 nov 2012marha2012-11-0723-1531/+1531
| | | | | | | | | | | | xserver: 011f8458805e443ac9130865d2840a929a00cabf xkbcomp: bd1103ef3cfef9cfed645566f944a69e7ca568b4 mesa: f42518962a08ce927e4ddd233d19d2661e135834
* | libXmu is now a dllmarha2012-06-276-0/+12
| | | | | | | | | | Exported variables in libX11 and libxcb should be declared with __declspec(dllimport)
* | Merge remote-tracking branch 'origin/released'marha2012-06-0820-7800/+7800
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0820-7800/+7800
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-121-10/+42
|\|
| * libxtrans libX11 libxcb xserver mesa git update 12 dec 2011marha2011-12-121-10/+42
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-271-6/+3
|\|
| * libX11 libXft mesa mkfontscale pixman xserver git update 26 okt 2011marha2011-10-261-6/+3
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-195-1014/+1002
|\| | | | | | | | | Conflicts: xorg-server/include/os.h
| * libX11 libXext libXft mesa libxcb mkfontscale pixman xservermarha2011-10-195-1014/+1002
| | | | | | | | xkeyboard-config git update 19 oct 2011
* | Merge remote-tracking branch 'origin/released'marha2011-10-101-2/+5
|\|
| * fontconfig libX11 mesa pixman xkeyboard-config git updte 10 oct 2011marha2011-10-101-2/+5
| |
* | Synchronised line endinge with release branchmarha2011-09-1217-19320/+19320
| |
* | Removed compile time warningsmarha2011-05-094-0/+4
| |
* | svn merge ^/branches/released .marha2011-04-2711-8376/+8323
|\|
| * xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011marha2011-04-2711-410/+357
| |
* | svn merge ^/branches/released .marha2011-04-157-2972/+2984
|\|
| * xserver xkeyboard-config libX11 mesa git update 15 April 2011marha2011-04-157-5545/+5557
| |
* | svn merge ^/branches/released .marha2011-04-131-1518/+1518
|\|
| * xkeyboard-config libxcb libX11 git update 13 April 2011marha2011-04-131-2/+2
| |
* | XKB_INSERVER is already defined in main makefilemarha2011-03-152-2/+0
| |
* | svn merge ^/branches/released .marha2011-03-121-1414/+1421
|\|
| * libX11 pixman mesa git update 12 Mar 2011marha2011-03-121-1414/+1421
| |
* | svn merge ^/branches/released .marha2011-02-223-619/+639
|\|
| * xserver libX11 pixman mesa git update 22 Feb 2011marha2011-02-223-126/+146
| |
* | svn merge ^/branches/released .marha2011-02-201-2/+3
|\|
| * xserver xkeyboard-config libX11 pixman mesa git update 2011marha2011-02-201-2/+3
| |
* | svn merge ^/branches/released .marha2011-02-036-3722/+3740
|\|
| * libXext xserver libXau libX11 pixman mesa git update 3 Feb 2011 marha2011-02-036-3719/+3739
| |
* | svn merge ^/branches/released .marha2010-09-045-1897/+1897
|\|
| * libx11 git update 4/9/2010marha2010-09-045-1897/+1897
| |
* | svn merge ^/branches/released .marha2010-07-0810-6282/+6271
|\|
| * git update 8/7/2010marha2010-07-0810-6281/+6270
| |
* | svn merge ^/branches/released .marha2010-06-116-6/+0
|\|
| * libX11 and libXext git update 11/6/2010marha2010-06-116-6/+0
| |
* | svn merge "^/branches/released" .marha2010-05-1919-11174/+4858
|\|