aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2013-10-2514-141/+323
|\ | | | | | | | | | | | | | | | | * origin/released: fontconfig mesa git update 25 oct 2013 Conflicts: mesalib/src/mesa/drivers/dri/common/dri_util.c mesalib/src/mesa/drivers/dri/swrast/swrast.c
| * fontconfig mesa git update 25 oct 2013marha2013-10-2514-138/+320
| | | | | | | | | | fontconfig commit 65872e9e46d17e4461c3a891ef23abe156005e04 mesa commit e8f6f244bb1963c4af81f431865355beef1b9cbb
* | Merge remote-tracking branch 'origin/released'marha2013-10-243-11/+16
|\| | | | | | | | | | | | | | | * origin/released: fontconfig mesa xserver git update 24 oct 2013 Conflicts: xorg-server/glx/glxdricommon.c
| * fontconfig mesa xserver git update 24 oct 2013marha2013-10-243-11/+16
| | | | | | | | | | | | xserver commit 7ecfab47eb221dbb996ea6c033348b8eceaeb893 fontconfig commit 76ea9af816a50c6bb0b3dc2960460a90fadd9cdb mesa commit a6e45b6a17462f4d261a2d176791469847356923
* | Merge remote-tracking branch 'origin/released'marha2013-10-215-4/+14
|\| | | | | | | | | * origin/released: fontconfig mesa xserver xkeyboard-config git update 21 okt 2013
| * fontconfig mesa xserver xkeyboard-config git update 21 okt 2013marha2013-10-215-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | xserver commit 8db4121a3c7104548fd4a138ac1d1bdea5fd22d9 libxcb commit e4e0c6eec861f4c69da12060dc8dbe7a63fa5eb6 libxcb/xcb-proto commit 55c75accecf0e76d2aa38656efd2be4044b9e643 xkeyboard-config commit 39a9a10ff11f6872e4b278240fbabb4e98209fa6 libX11 commit 18a5278b008e9faa59b346fcab18a8d74b875fda libXdmcp commit 089081dca4ba3598c6f9bf401c029378943b5854 libXext commit 7378d4bdbd33ed49ed6cfa5c4f73d7527982aab4 libfontenc commit 3acba630d8b57084f7e92c15732408711ed5137a libXinerama commit 6e1d1dc328ba8162bba2f4694e7f3c706a1491ff libXau commit 304a11be4727c5a7feeb2501e8e001466f8ce84e xkbcomp commit 839ccda42d8b088d94324cd77c4be954859914d3 pixman commit 3c2f4b651747c1ac484c39d5128cae5483094342 xextproto commit f27fcc99d1cf935cc289933326f7d3baacd5107a randrproto commit ca7cc541c2e43e6c784df19b4583ac35829d2f72 glproto commit 8e3407e02980d088e20041e79bdcdd3737e7827e mkfontscale commit f48de13423c7300f4da9f61993b624426b38ddc0 xwininfo commit ba0d1b0da21d2dbdd81098ed5778f3792b472e13 libXft commit c5e760a239afc62a1c75e0509868e35957c8df52 libXmu commit 2539e539eafdac88177c8ee30b043c5d52f017e4 libxtrans commit f6a161f2a003f4da0a2e414b4faa0ee0de0c01f0 fontconfig commit 5e029db4971e37437cfe6147d52d00136dfb8cb5 mesa commit 14429295e16cf9b7616494fb68f400dfb9c80c71
* | Solved mesa compilation errorsmarha2013-10-182-38/+45
| |
* | Merge remote-tracking branch 'origin/released'marha2013-10-189-98/+246
|\| | | | | | | | | | | | | | | | | * origin/released: mesa pixman git update 18 okt 2013 Conflicts: mesalib/include/GL/glext.h mesalib/include/GL/glxext.h
| * mesa pixman git update 18 okt 2013marha2013-10-189-98/+246
| | | | | | | | | | pixman commit 3c2f4b651747c1ac484c39d5128cae5483094342 mesa commit 9aad1ba70fad7bfa45778faa5a91235f8302264f
* | Merge remote-tracking branch 'origin/released'marha2013-10-1626-479/+324
|\| | | | | | | | | | | | | | | | | * origin/released: fontconfig libxcb libxcb/xcb-proto xserver mesa pixman xkbcomp git update 16 oct 2013 Conflicts: mesalib/src/mesa/drivers/dri/common/drisw_util.c pixman/pixman/pixman-mmx.c
| * fontconfig libxcb libxcb/xcb-proto xserver mesa pixman xkbcomp git update 16 ↵marha2013-10-1626-478/+324
| | | | | | | | | | | | | | | | | | | | | | | | oct 2013 xserver commit 7cf1b595c8c8f9776a39559d2878cf90af3f2859 libxcb commit e4e0c6eec861f4c69da12060dc8dbe7a63fa5eb6 libxcb/xcb-proto commit 55c75accecf0e76d2aa38656efd2be4044b9e643 xkbcomp commit 839ccda42d8b088d94324cd77c4be954859914d3 pixman commit 9e81419ed5c0ee490ddacf7bada516a25cae87eb fontconfig commit 5406919c5e186f74ccdade1a65344ce7b5c56a64 mesa commit 6e444a72c1f9e4446e025b8cb780523cb89f0584
* | Merge remote-tracking branch 'origin/released'marha2013-10-075-1/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | * origin/released: xserver fontconfig libXdmcp mesa pixmand xkeyboard-config git update 7 oct 2013 Conflicts: xorg-server/dix/dispatch.c xorg-server/dix/privates.c xorg-server/glx/glxcmds.c xorg-server/hw/kdrive/ephyr/ephyr.h xorg-server/hw/kdrive/ephyr/ephyrinit.c xorg-server/hw/kdrive/ephyr/hostx.c
| * xserver fontconfig libXdmcp mesa pixmand xkeyboard-config git update 7 oct 2013marha2013-10-075-1/+9
| | | | | | | | | | | | | | | | | | xserver commit ccbe17b1c6da1ad9d085fc8133cdd15dc7004a4a xkeyboard-config commit c8326b7d12b20eccfd38d661b95d9b23d8a56e27 libXdmcp commit 089081dca4ba3598c6f9bf401c029378943b5854 pixman commit c89f4c826695dbb5df0817d84f845dbd3e28b7a7 fontconfig commit 604c2a683f1357fc65bad372b5d25a90099f827f mesa commit cfbfb50cb8d47b7f6975828b504936f9324f3b12
* | Merge remote-tracking branch 'origin/released'marha2013-10-036-0/+23
|\| | | | | | | | | | | | | | | | | * origin/released: mesa xkeyboard-config git update 3 Oct 2003 Conflicts: xorg-server/xkeyboard-config/symbols/level3 xorg-server/xkeyboard-config/symbols/level5
| * mesa xkeyboard-config git update 3 Oct 2003marha2013-10-036-0/+23
| | | | | | | | | | xkeyboard-config commit 7c7f937a2203bdcdc3b2e7cbe55ddfc34cffe3ab mesa commit d1335926196c216f1abe73f37cfcb61cf7f2bd28
* | Merge remote-tracking branch 'origin/released'marha2013-10-027-24/+58
|\| | | | | | | | | | | | | | | | | * origin/released: fontconfig mesa pixman xkeyboard-config git update 2 Okt 2013 Conflicts: mesalib/src/glsl/ast.h mesalib/src/glsl/glsl_parser_extras.h
| * fontconfig mesa pixman xkeyboard-config git update 2 Okt 2013marha2013-10-027-24/+58
| | | | | | | | | | | | | | xkeyboard-config commit e5a53229a9914235921911f05b31d6092e844ea1 pixman commit 7d05a7f4dc825f9c778e534fdabb749199c2e439 fontconfig commit 0203055520206028eecee5d261887cdc91500e15 mesa commit 848c0e72f36d0e1e460193a2d30b2f631529156f
* | Merge remote-tracking branch 'origin/released'marha2013-10-014-13/+1
|\| | | | | | | | | * origin/released: libX11 mesa xkeyboard-config mesa git update 1 Oct 2013
| * libX11 mesa xkeyboard-config mesa git update 1 Oct 2013marha2013-10-014-13/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | xserver commit 7d3d4ae55dd6ee338439e2424ac423b1df80501b libxcb commit f1405d9fe4a6ddcae24585ba254389a4c4f4c8c9 libxcb/xcb-proto commit bd7708ac1037e647b094fa7440ebb6171b9bc75f xkeyboard-config commit aae40f98d6694e852c5e192f05643adbd16a3253 libX11 commit 18a5278b008e9faa59b346fcab18a8d74b875fda libXdmcp commit 66514a4af7eaa47e8718434356d7efce95e570cf libXext commit 7378d4bdbd33ed49ed6cfa5c4f73d7527982aab4 libfontenc commit 3acba630d8b57084f7e92c15732408711ed5137a libXinerama commit 6e1d1dc328ba8162bba2f4694e7f3c706a1491ff libXau commit 304a11be4727c5a7feeb2501e8e001466f8ce84e xkbcomp commit 24d18e0a844041ef82441adb16aa18cc4b4814ae pixman commit b513b3dffe979056dbbbdc8e0659f8018c51c5f5 xextproto commit f27fcc99d1cf935cc289933326f7d3baacd5107a randrproto commit ca7cc541c2e43e6c784df19b4583ac35829d2f72 glproto commit 8e3407e02980d088e20041e79bdcdd3737e7827e mkfontscale commit f48de13423c7300f4da9f61993b624426b38ddc0 xwininfo commit ba0d1b0da21d2dbdd81098ed5778f3792b472e13 libXft commit c5e760a239afc62a1c75e0509868e35957c8df52 libXmu commit 2539e539eafdac88177c8ee30b043c5d52f017e4 libxtrans commit f6a161f2a003f4da0a2e414b4faa0ee0de0c01f0 fontconfig commit 9161ed1e4a3f4afaee6dbcfc0b84a279ad99b397 mesa commit eb0a57acaa7026b3212742a30f4ada3271d95616
* | Merge remote-tracking branch 'origin/released'marha2013-09-3019-26/+830
|\| | | | | | | | | * origin/released: git update fontconfig mesa libXau pixman xkeyboard-config 30 Sep 2013
| * git update fontconfig mesa libXau pixman xkeyboard-config 30 Sep 2013marha2013-09-3019-26/+830
| | | | | | | | | | | | | | | | xkeyboard-config commit fe5c2416314fd1df423c8ce53cac2d28b00420e7 libXau commit 304a11be4727c5a7feeb2501e8e001466f8ce84e pixman commit b513b3dffe979056dbbbdc8e0659f8018c51c5f5 fontconfig commit 9161ed1e4a3f4afaee6dbcfc0b84a279ad99b397 mesa commit 868791f0baa0b51f4255c839448d3ca87ab1aa35
* | Merge remote-tracking branch 'origin/released'marha2013-09-258-25/+48
|\| | | | | | | | | * origin/released: fontconfig mesa git update 25 Sep 2013
| * fontconfig mesa git update 25 Sep 2013marha2013-09-258-25/+48
| | | | | | | | | | fontconfig commit 102864d0dba46c99b22c912454c1f58731287405 mesa commit 59157d1c96f33ca56d9aba6cff75145d732dbbab
* | Merge remote-tracking branch 'origin/released'marha2013-09-232-22/+2
|\| | | | | | | | | | | | | | | | | | | | | | | * origin/released: mesa xserver git update 23 Sep 2013 Conflicts: mesalib/src/glsl/ast.h mesalib/src/glsl/glsl_parser_extras.h mesalib/src/glsl/glsl_symbol_table.cpp mesalib/src/glsl/ir_constant_expression.cpp mesalib/src/glsl/list.h
| * mesa xserver git update 23 Sep 2013marha2013-09-232-22/+2
| | | | | | | | | | xserver commit 7d3d4ae55dd6ee338439e2424ac423b1df80501b mesa commit 6d29db715b8d60718ada1ab8ad19d969cac43caf
* | Merge remote-tracking branch 'origin/released'marha2013-09-205-13/+55
|\| | | | | | | | | * origin/released: fontconfig mesa pixman git update 20 Sep 2013
| * fontconfig mesa pixman git update 20 Sep 2013marha2013-09-205-13/+55
| | | | | | | | | | | | pixman commit aa5c45254eb60ce4c85a25b5343474fb160ffa7c fontconfig commit 643f8088f0d51107e58d142df47124efec6afab1 mesa commit 1cc3b90d47f92aa0be2d914191fd2f46d2b127d7
* | Merge remote-tracking branch 'origin/released'marha2013-09-188-10/+84
|\| | | | | | | | | | | | | | | * origin/released: libX11 mesa pixman xserver git update 18 Sep 2013 Conflicts: pixman/pixman/pixman-sse2.c
| * libX11 mesa pixman xserver git update 18 Sep 2013marha2013-09-188-10/+84
| | | | | | | | | | | | | | xserver commit 8010d3a48bd0b224dcb0883e39c2351ad364d846 libX11 commit 5dcb40f28d59587597d2ff6e6ac64c71cfe6ff7b pixman commit 58a79dfe6d1fd62c2b66c69fdb64f6b8ecf61da5 mesa commit a3b51a22f71819236baa6bbda9d0d050914b149d
* | Merge remote-tracking branch 'origin/released'marha2013-09-114-5/+4
|\| | | | | | | | | | | | | | | * origin/released: fontconfig mesa pixman git update 11 Sep 2013 Conflicts: pixman/pixman/pixman-sse2.c
| * fontconfig mesa pixman git update 11 Sep 2013marha2013-09-114-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | xserver commit 47ff382d1fce25a8b097d45b79489e891f1f1228 libxcb commit f1405d9fe4a6ddcae24585ba254389a4c4f4c8c9 libxcb/xcb-proto commit bd7708ac1037e647b094fa7440ebb6171b9bc75f xkeyboard-config commit c2309b50e7ef7b9263278fd8ff73dda1484d72db libX11 commit cb107760df33ffc8630677e66e2e50aa37950a5c libXdmcp commit 66514a4af7eaa47e8718434356d7efce95e570cf libXext commit 7378d4bdbd33ed49ed6cfa5c4f73d7527982aab4 libfontenc commit 3acba630d8b57084f7e92c15732408711ed5137a libXinerama commit 6e1d1dc328ba8162bba2f4694e7f3c706a1491ff libXau commit 899790011304c4029e15abf410e49ce7cec17e0a xkbcomp commit 24d18e0a844041ef82441adb16aa18cc4b4814ae pixman commit a4c79d695d52c94647b1aff78548e5892d616b70 xextproto commit f27fcc99d1cf935cc289933326f7d3baacd5107a randrproto commit ca7cc541c2e43e6c784df19b4583ac35829d2f72 glproto commit 8e3407e02980d088e20041e79bdcdd3737e7827e mkfontscale commit f48de13423c7300f4da9f61993b624426b38ddc0 xwininfo commit ba0d1b0da21d2dbdd81098ed5778f3792b472e13 libXft commit c5e760a239afc62a1c75e0509868e35957c8df52 libXmu commit 2539e539eafdac88177c8ee30b043c5d52f017e4 libxtrans commit f6a161f2a003f4da0a2e414b4faa0ee0de0c01f0 fontconfig commit 7e44a0b5a88e597b33ba9e2cc3a6d4555736db0a mesa commit b217d48364f368f541e53006af5dd56f664be24d
* | Merge remote-tracking branch 'origin/released'marha2013-09-108-5/+30
|\| | | | | | | | | | | | | | | | | | | | | | | * origin/released: fontconfig libX11 libXmu libxcb mesa xserver git update 10 Sep 2013 Conflicts: mesalib/src/glsl/.gitignore xorg-server/hw/xwin/InitOutput.c xorg-server/hw/xwin/winclipboardwndproc.c xorg-server/hw/xwin/winmultiwindowwm.c xorg-server/hw/xwin/winsetsp.c
| * fontconfig libX11 libXmu libxcb mesa xserver git update 10 Sep 2013marha2013-09-108-5/+30
| | | | | | | | | | | | | | | | | | xserver commit 47ff382d1fce25a8b097d45b79489e891f1f1228 libxcb commit f1405d9fe4a6ddcae24585ba254389a4c4f4c8c9 libX11 commit cb107760df33ffc8630677e66e2e50aa37950a5c libXmu commit 2539e539eafdac88177c8ee30b043c5d52f017e4 fontconfig commit a61e145304da86c8c35b137493bbd8fd5dd1e7f5 mesa commit 395b9410860371a64d6b5f2d50679f29eb41729e
* | Merge remote-tracking branch 'origin/released'marha2013-09-0432-193/+966
|\| | | | | | | | | * origin/released: fontconfig xkeyboard-config git update 4 Sep 2013
| * fontconfig xkeyboard-config git update 4 Sep 2013marha2013-09-0432-193/+966
| | | | | | | | | | | | xkeyboard-config commit 8f49c92c54c53eab6d40d8be90ce06773d20d196 fontconfig commit 6720892e97f11fbe8d69ae5b3875d928c68ff90e mesa commit 51a279254fecc05691524dab1bf291c7dfefccd5
* | Merge remote-tracking branch 'origin/released'marha2013-09-021-10/+8
|\| | | | | | | | | * origin/released: fontconfig libX11 mesa pixman git update 2 Sep 2013
| * fontconfig libX11 mesa pixman git update 2 Sep 2013marha2013-09-021-10/+8
| | | | | | | | | | | | | | libX11 commit 215ce6a67863de7acfd6dd3562b4fd97ef87b411 pixman commit 02906e57bd801e20b3094ca348fad563c6b5a922 fontconfig commit d2bb1a8381ba50dce79a487cd82087ca57fdcb68 mesa commit da33347131ff88a3b7979aea2031ce6f34319ed0
* | Merge remote-tracking branch 'origin/released'marha2013-08-304-21/+44
|\| | | | | | | | | * origin/released: fontconfig mesa xserver xkeyboard-config xkbcomp git update 30 aug 2013
| * fontconfig mesa xserver xkeyboard-config xkbcomp git update 30 aug 2013marha2013-08-304-21/+44
| | | | | | | | | | | | | | | | xserver commit 94d4e29aedc69431fa9b299ca1b67947173d7a24 xkeyboard-config commit fcb91cb1013cbdd87a6f77533f188d5934f24046 xkbcomp commit 24d18e0a844041ef82441adb16aa18cc4b4814ae fontconfig commit 071ce44c35733e54cb477cc75810cbe55025b619 mesa commit f7217b99f243738f941a5d009c68387dfadcb50a
* | Merge remote-tracking branch 'origin/released'marha2013-08-272-1/+3
|\| | | | | | | | | * origin/released: fontconfig mesalib git update 27 aug 2013
| * fontconfig mesalib git update 27 aug 2013marha2013-08-272-1/+3
| | | | | | | | | | fontconfig commit c6228f8091ab91b67ea006ad5a1b1da97b3d4a5a mesa commit d8ac987f6ab228df1a478b36c3d889992754374f
* | Merge remote-tracking branch 'origin/released'marha2013-08-2610-28/+62
|\| | | | | | | | | * origin/released: xserver mesa fontconfig libX11 libxcb libxcb/xcb-proto xkeyboard-config git update 26 Aug 2013
| * xserver mesa fontconfig libX11 libxcb libxcb/xcb-proto xkeyboard-config git ↵marha2013-08-2610-28/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update 26 Aug 2013 xserver commit e01a3f65d3e6d92f92ef2992b338cc9625bde082 libxcb commit c52f2891b43ae77008f63700982f800371458f4d libxcb/xcb-proto commit bd7708ac1037e647b094fa7440ebb6171b9bc75f xkeyboard-config commit 77026e8c59cc64856180452c5f89be86928fea7c libX11 commit e9b14d10d0258bfcc273ff8bc84cd349dccda62c libXdmcp commit 66514a4af7eaa47e8718434356d7efce95e570cf libXext commit 7378d4bdbd33ed49ed6cfa5c4f73d7527982aab4 libfontenc commit 3acba630d8b57084f7e92c15732408711ed5137a libXinerama commit 6e1d1dc328ba8162bba2f4694e7f3c706a1491ff libXau commit 899790011304c4029e15abf410e49ce7cec17e0a xkbcomp commit 0ebdf47fd4bc434ac3d2339544c022a869510738 pixman commit 3518a0dafa63098d41e466f73d105b7e3e4b12de xextproto commit f27fcc99d1cf935cc289933326f7d3baacd5107a randrproto commit ca7cc541c2e43e6c784df19b4583ac35829d2f72 glproto commit 8e3407e02980d088e20041e79bdcdd3737e7827e mkfontscale commit f48de13423c7300f4da9f61993b624426b38ddc0 xwininfo commit ba0d1b0da21d2dbdd81098ed5778f3792b472e13 libXft commit c5e760a239afc62a1c75e0509868e35957c8df52 libXmu commit d5dac08d65c4865f311cb62c161dbb1300eecd11 libxtrans commit f6a161f2a003f4da0a2e414b4faa0ee0de0c01f0 fontconfig commit fba9efecd2ef3aca84e0a4806899c09ba95f4c19 mesa commit 7fa18774bd9d0e97a82ee9b7dfce8fc5a1041c3a
* | Merge remote-tracking branch 'origin/released'marha2013-08-1922-223/+575
|\| | | | | | | | | | | | | | | * origin/released: fontconfig libX11 libXdmcp libxcb xkeyboard-config mesa pixman xserver git update 19 aug 2013 Conflicts: fontconfig/src/fccache.c
| * fontconfig libX11 libXdmcp libxcb xkeyboard-config mesa pixman xserver git ↵marha2013-08-1922-223/+575
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update 19 aug 2013 xserver commit fe7463b8ce0de301c2f82b108c93963424f77219 libxcb commit 5648ddd2b97068f549268284129a438a6845e14c libxcb/xcb-proto commit 56a82005ac388fcb7a4d1c82e07c7e72eaf69a32 xkeyboard-config commit 87c865aee1844b2cc6b1a5a208116dd095f4d76a libX11 commit 9b291044a240e5b9b031ed814e0c84e53a1c3084 libXdmcp commit 66514a4af7eaa47e8718434356d7efce95e570cf libXext commit 7378d4bdbd33ed49ed6cfa5c4f73d7527982aab4 libfontenc commit 3acba630d8b57084f7e92c15732408711ed5137a libXinerama commit 6e1d1dc328ba8162bba2f4694e7f3c706a1491ff libXau commit 899790011304c4029e15abf410e49ce7cec17e0a xkbcomp commit 0ebdf47fd4bc434ac3d2339544c022a869510738 pixman commit 3518a0dafa63098d41e466f73d105b7e3e4b12de xextproto commit f27fcc99d1cf935cc289933326f7d3baacd5107a randrproto commit ca7cc541c2e43e6c784df19b4583ac35829d2f72 glproto commit 8e3407e02980d088e20041e79bdcdd3737e7827e mkfontscale commit f48de13423c7300f4da9f61993b624426b38ddc0 xwininfo commit ba0d1b0da21d2dbdd81098ed5778f3792b472e13 libXft commit c5e760a239afc62a1c75e0509868e35957c8df52 libXmu commit d5dac08d65c4865f311cb62c161dbb1300eecd11 libxtrans commit f6a161f2a003f4da0a2e414b4faa0ee0de0c01f0 fontconfig commit 084cf7c44e985dd48c088d921ad0d9a43b0b00b4 mesa commit d13003f544417db6de44c65a0c118bd2b189458a
* | Merge remote-tracking branch 'origin/released'marha2013-08-0122-61/+165
|\| | | | | | | | | * origin/released: libX11 mesa xserver xkeyboard-config git update 1 aug 2013
| * libX11 mesa xserver xkeyboard-config git update 1 aug 2013marha2013-08-0122-61/+165
| | | | | | | | | | | | | | xserver commit b6e5c4669e0db391966deb397e8c975ec7f0124d xkeyboard-config commit abaf14335dc6504e59d91e77babc8e034df5beb7 libX11 commit 44f84223f5e2dd46883fcbd352af2798bfa9aeb6 mesa commit 3eef7fec677f40eef1674e44e7ebd836bc7f8612
* | 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-254-49/+91
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/released: xserver mesa git update 25 Jul 2013 Conflicts: xorg-server/hw/xwin/win.h xorg-server/hw/xwin/winclipboardthread.c xorg-server/hw/xwin/winglobals.c xorg-server/hw/xwin/winmouse.c xorg-server/hw/xwin/winmultiwindowclass.c xorg-server/hw/xwin/winscrinit.c xorg-server/hw/xwin/winwin32rootless.c xorg-server/hw/xwin/winwin32rootlesswndproc.c xorg-server/hw/xwin/winwindow.h xorg-server/hw/xwin/winwindowswm.c xorg-server/hw/xwin/winwndproc.c
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 03:26:37 +0000