aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2013-01-247-194/+104
|\ | | | | | | | | | | | | | | * origin/released: fontconfig mesa pixman xkbcomp xserver git update 24 jan 2013 Conflicts: mesalib/src/glsl/.gitignore
| * fontconfig mesa pixman xkbcomp xserver git update 24 jan 2013marha2013-01-247-194/+104
| | | | | | | | | | | | | | | | fontconfig: fb3b410998aba8835999e2ca7003a180431cfaf4 mesa: 5bd86b26df30d32412ca1b7ac02892ab5e10c6ef pixman: b527a0e615a726aa6a7d18f0ea0b38564b153afa xkbcomp: 705b9bbb426410f9510601c7010da51184919b36 xserver: 7fe5e6dfa5c1e71d8b7540b28c1d508687a2fbee
* | Merge remote-tracking branch 'origin/released'marha2013-01-2270-1682/+697
|\| | | | | | | | | | | | | | | | | | | | | * origin/released: fontconfig libfontenc mesa mkfontscale pixman xserver xkeyboard-config Conflicts: mesalib/src/mesa/main/syncobj.c mesalib/src/mesa/main/syncobj.h xorg-server/hw/xwin/winconfig.c xorg-server/hw/xwin/winmultiwindowwndproc.c
| * fontconfig libfontenc mesa mkfontscale pixman xserver xkeyboard-configmarha2013-01-2270-1682/+697
| | | | | | | | | | | | | | | | | | | | fontconfig: 000ca9ccb03013a5b151f0d21148ab0ca4c2f2de libfontenc: f5d1208172e965fdd7fae8927bd3e29b3cc3a975 mesa: 148fc6d53716f39971a453792570c2b8c207efb6 mkfontscale: 547517571e695728278a264eedbac47b6e1f43bc pixman: 2c6577476e5b18e17904ae8af244a39c352e2e33 xserver: 70b127c9f1c53bdb42f078265e67f76b464deae2 xkeyboard-config: 6b35b1b43d2fdff30f530d7cf65fffd6c3504690
* | Merge remote-tracking branch 'origin/released'marha2013-01-171-0/+3
|\| | | | | | | | | * origin/released: fontconfig libxcb mesa xkbcomp git update 17 jan 2013
| * fontconfig libxcb mesa xkbcomp git update 17 jan 2013marha2013-01-171-0/+3
| | | | | | | | | | | | | | fontconfig: 671bcb34e23ed03b1f564af35560db81f8b12b96 libxcb: 0dd8f8d26a758bc385e79d9239bf6ef2e3d7bf13 mesa: 56c01d81094795286828ecb83713e043695e905a xkbcomp: ed1b90216e59e6b3ac6ac5fd2faca8e056c76caa
* | Merge remote-tracking branch 'origin/released'marha2013-01-1618-157/+1076
|\| | | | | | | | | | | | | * 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-1618-157/+1076
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge remote-tracking branch 'origin/released'marha2013-01-1417-60/+338
|\| | | | | | | | | | | | | | | * 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-1417-60/+338
| | | | | | | | | | | | | | | | | | | | | | | | | | 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'marha2013-01-119-66/+148
|\| | | | | | | | | | | | | | | | | | | | | * origin/released: fontconfig libX11 mesa mkfontscale xserver git update 11 jan 2013 Conflicts: mesalib/src/glsl/.gitignore mesalib/src/glsl/glcpp/.gitignore mesalib/src/mapi/glapi/gen/.gitignore mesalib/src/mesa/program/.gitignore
| * fontconfig libX11 mesa mkfontscale xserver git update 11 jan 2013marha2013-01-119-66/+148
| | | | | | | | | | | | | | | | fontconfig: 0831c1770e4bac7269a190936bbb0529d747e233 libX11: 0b148750027fd0557c5ed93afda861ddf4b92e0f mkfontscale: 9cbe3256bc932b82f2435b23cda0931f4f5f5ba2 xserver: 6703a7c7cf1a349c137e247a0c8eb462ff7b07be mesa: babab2876080af0fe65249dff559244aebd0b87e
* | Merge remote-tracking branch 'origin/released'marha2013-01-0720-137/+438
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/released: pixman xkbcomp libX11 libXau mesa fontconfig xserver xkeyboard-config git update 7 jan 2013 Conflicts: fontconfig/src/fcatomic.c pixman/pixman/pixman-mmx.c pixman/pixman/pixman-sse2.c xorg-server/dix/dispatch.c xorg-server/hw/xwin/wincursor.c xorg-server/hw/xwin/winmsg.c xorg-server/hw/xwin/winscrinit.c xorg-server/hw/xwin/winsetsp.c xorg-server/hw/xwin/winwin32rootless.c xorg-server/xfixes/cursor.c
| * pixman xkbcomp libX11 libXau mesa fontconfig xserver xkeyboard-config git ↵marha2013-01-0720-137/+438
| | | | | | | | | | | | | | | | | | | | | | | | | | update 7 jan 2013 fontconfig: 17eda89ed2e24a3fc5f68538dd7fd9ada8efb087 xserver: bd91b05b631f13afd1f7a9d6cbc4f0c5408b523a xkeyboard-config: 4779e2745094ebe0c06364b4099d7067ae750d07 libX11: cd25cab4b5b957641183ce72dd1ae0424aff1663 libXau: e04364efccbb3bb4cfc5f4cb491ffa1faaaacbdb mesa: afec10df373f342f058aab66c622237964a4a147 pixman: 35cc965514ca6e665c18411fcf66db826d559c2a xkbcomp: e4f767913338052527538d429931e8abd8c3fb88
* | Merge remote-tracking branch 'origin/released'marha2012-12-1727-678/+644
|\| | | | | | | | | | | | | | | * origin/released: libXft pixman mesa git update 17 dec 2012 Conflicts: mesalib/src/mesa/drivers/dri/swrast/swrast.c
| * libXft pixman mesa git update 17 dec 2012marha2012-12-1727-678/+644
| | | | | | | | | | | | libXft: 835cd2a6cb4aa8f89e6e7dead66483643a6e7ee8 pixman: 526dc06e5694172abf979c03a5cf530207fe2d27 mesa: 1358f3a905448f6fb546aba951e317f743a83c76
* | Merge remote-tracking branch 'origin/released'marha2012-12-122-5/+10
|\| | | | | | | | | * origin/released: fontconfig mesa pixman xkeyboard-config git update 12 dev 2012
| * fontconfig mesa pixman xkeyboard-config git update 12 dev 2012marha2012-12-122-5/+10
| | | | | | | | | | | | | | fontconfig: 9ce36f4bbebc702a35d0cd9f1a59d5b828549bc6 mesa: 621259b3de1f15c879620bbf17764fd8a27ae6f5 pixman: fdab3c1b6cd9c5e197ec3f6bc0a03da32880e317 xkeyboard-config: 378597a9d525f069c049fdd6d04ff628123f82c7
* | Merge remote-tracking branch 'origin/released'marha2012-12-1020-91/+2372
|\| | | | | | | | | | | | | | | * origin/released: fontconfig libX11 mesa pixman git update 10 dec 2012 Conflicts: fontconfig/src/fcxml.c
| * fontconfig libX11 mesa pixman git update 10 dec 2012marha2012-12-1020-91/+2372
| | | | | | | | | | | | | | libX11 9833489e6c3829a1e835bc0a11f028fc180809e4 mesa 17f5dc57306b8f5079304701e455bf4b927d3cae pixman 8ca4e144724ba2041bc5ef077ccf6d24e7cf4d1f fontconfig 608c5b590bd3428dfcd30f3d68ee8b7131e2f019
* | Merge remote-tracking branch 'origin/released'marha2012-12-054-9/+12
|\| | | | | | | | | * origin/released: mesa git update 5 dec 2012
| * mesa git update 5 dec 2012marha2012-12-054-9/+12
| | | | | | | | mesa: 484a8dcfa8c8b91b8e99174b5e4953264f32789e
* | Merge remote-tracking branch 'origin/released'marha2012-12-0331-349/+378
|\| | | | | | | | | * origin/released: fontconfig mesa xserver pixman xkeyboard-config git update 3 dec 2012
| * fontconfig mesa xserver pixman xkeyboard-config git update 3 dec 2012marha2012-12-0331-349/+378
| | | | | | | | | | | | | | | | fontconfig: 2442d611579bccb84f0c29e3f9ceb0a7436df812 mesa: 54ff536823bf5a431efe1f2becdb21174c146948 xserver: b51a1bd2766e7dc975ca8f1cacc3f8bd0e1a68a3 pixman: 978bab253d1d061b00b5e80aa45ab6986aac466f xkeyboard-config: 05dcc6db64cd7425aea6d22efd6a3ecf34dbddd2
* | Merge remote-tracking branch 'origin/released'marha2012-11-295-30/+58
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/released: fontconfig xserver mesa git update 29 nov 2012 Conflicts: xorg-server/dix/dispatch.c xorg-server/hw/xwin/InitOutput.c xorg-server/hw/xwin/ddraw.h xorg-server/hw/xwin/glx/indirect.c xorg-server/hw/xwin/winclipboardthread.c xorg-server/hw/xwin/winclipboardxevents.c xorg-server/hw/xwin/winengine.c xorg-server/hw/xwin/winerror.c xorg-server/hw/xwin/winglobals.c xorg-server/hw/xwin/winkeybd.c xorg-server/hw/xwin/winmultiwindowwm.c xorg-server/hw/xwin/winmultiwindowwndproc.c xorg-server/hw/xwin/winprocarg.c xorg-server/hw/xwin/winwin32rootless.c xorg-server/hw/xwin/winwindow.h xorg-server/os/osinit.c xorg-server/os/utils.c
| * fontconfig xserver mesa git update 29 nov 2012marha2012-11-295-30/+58
| | | | | | | | | | | | xserver: 1712a45422a63f11b2146541279616fcfda09ec6 fontconfig: faea1cac85ac3b0fd6a983e1c0adeb68e115e06c mesa: c1023608002c985b9d72edc64732cd666de2a206
* | Merge remote-tracking branch 'origin/released'marha2012-11-213-6/+7
|\| | | | | | | | | * origin/released: Git update 21 nov 2012
| * Git update 21 nov 2012marha2012-11-213-6/+7
| | | | | | | | | | | | fontconfig: 376fc9d22f1480ac380a3845f4cb4fe227e4be9a mesa: d82b873a501606d62b9f208b6d5cda79c9a6b4b8 xkeyboard-config: 0be23e0774bebdaa9766ddd7a1f3cf088d079bf0
* | Merge remote-tracking branch 'origin/released'marha2012-11-1968-2068/+2064
|\| | | | | | | | | | | | | | | | | | | | | | | | | * 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-1968-2068/+2064
| | | | | | | | | | | | | | | | | | fontconfig: c20ac78b01df3f0919352bba16b5b48b3b5d4d6d libxcb: 76a2166de9c80b35f987fdc3f3a228bafa0de94e mesa: ddb901fbf4489ffcd85d3320f23913eb1d4fbdfe pixman: 44dd746bb68625b2f6be77c3f80292b45defe9d7 xserver: 6a6c3afe71ac82a93d9fd0034dd5bbdcf0eae1ea xkeyboard-config: 709e05c069428236ca2567e784c9971eecc8ca50
* | Merge remote-tracking branch 'origin/released'marha2012-11-0916-24/+128
|\| | | | | | | | | * origin/released: mesa git update 9 nov 2012
| * mesa git update 9 nov 2012marha2012-11-0916-24/+128
| | | | | | | | mesa: 011f8458805e443ac9130865d2840a929a00cabf
* | Merge remote-tracking branch 'origin/released'marha2012-11-0753-1929/+1373
|\| | | | | | | | | | | | | | | | | | | | | | | * 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-0753-1929/+1373
| | | | | | | | | | | | xserver: 011f8458805e443ac9130865d2840a929a00cabf xkbcomp: bd1103ef3cfef9cfed645566f944a69e7ca568b4 mesa: f42518962a08ce927e4ddd233d19d2661e135834
* | Merge remote-tracking branch 'origin/released'marha2012-11-0725-4304/+402
|\| | | | | | | | | | | | | | | | | | | | | | | | | * origin/released: xserver mesa xkbcomp git update 5 nov 2012 Conflicts: mesalib/src/glsl/.gitignore mesalib/src/mesa/main/.gitignore xorg-server/Xi/chgdctl.c xorg-server/dix/getevents.c xorg-server/hw/xwin/winprefs.c xorg-server/os/utils.c
| * xserver mesa xkbcomp git update 5 nov 2012marha2012-11-0525-4304/+402
| | | | | | | | | | | | xserver: a194630f7f7b287cb4ea4a459df0745f4c0d4c1a mesa: ccbfe3dde94cd50a4e6468cfeabf95c79c9d8072 xkbcomp: a68c5b7b29eb1433b1be73b50c4248e10eab8e64
* | Merge remote-tracking branch 'origin/released'marha2012-10-316-88/+34
|\| | | | | | | | | * origin/released: mesa git update 31 oct 2012
| * mesa git update 31 oct 2012marha2012-10-316-88/+34
| | | | | | | | mesa: 183e122bdfe27f875c3c121964484dae9587c051
* | Solved problem of dxtn.dll not loaded anymoremarha2012-10-311-3/+3
| |
* | Now create a seperate installer for the debug exe and dllsmarha2012-10-301-4/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2012-10-309-22/+22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/released: fontconfig xserver mesa git update 30 oct 2012 Conflicts: xorg-server/dix/grabs.c xorg-server/hw/xwin/winclipboard.h xorg-server/hw/xwin/winclipboardthread.c xorg-server/hw/xwin/winclipboardwrappers.c xorg-server/hw/xwin/winmonitors.c xorg-server/hw/xwin/winmsg.c xorg-server/hw/xwin/winmsg.h xorg-server/hw/xwin/winprefslex.l xorg-server/hw/xwin/winprefsyacc.y xorg-server/hw/xwin/winregistry.c
| * fontconfig xserver mesa git update 30 oct 2012marha2012-10-309-22/+22
| | | | | | | | | | | | fontconfig: bdaef0b80dc27f4ab7a9d9bcedcfd8b5724b3cfd xserver: 1ca096d5e07221025c4c4110528772b7d94f15ee mesa: 0a66ced8f822b0d5478b0cd6d72c1a6ad70647a2
* | Merge remote-tracking branch 'origin/released'marha2012-10-2512-156/+207
|\| | | | | | | | | * origin/released: fontconfig mesa pixman git update
| * fontconfig mesa pixman git updatemarha2012-10-2512-156/+207
| | | | | | | | | | | | fonconfig: 73ab254336100c5971e3a1e14b73222efd0e9822 mesa: 86cd77d0a9ac940c2c06eebc5e9ef840d176712a pixman: 9df645dfb04b5a790faabe1e9a84fc37287d91b0
* | Merge remote-tracking branch 'origin/released'marha2012-10-223-50/+0
|\| | | | | | | | | * origin/released: libX11 mesa pixman git update 22 oct 2012
| * libX11 mesa pixman git update 22 oct 2012marha2012-10-223-50/+0
| | | | | | | | | | | | libX11: f2a8def423a46d52e834cf7ea49fa0079427663a mesa: 259fc154f1fdcabbc0a6c02c524962b063f9dee6 pixman: 31e5a0a393defb8e0534ab1bde29ab23fc04795d
* | Merge remote-tracking branch 'origin/released'marha2012-10-1748-2149/+90
|\| | | | | | | | | * origin/released: pixman mesa git update 17 oct 2012
| * pixman mesa git update 17 oct 2012marha2012-10-1748-2149/+90
| | | | | | | | | | pixman: 6e56098c0338ce74228187e4c96fed1a66cb0956 mesa: 0199ff7fe323cf527ffacfdef3258ab85799dd13
* | Merge remote-tracking branch 'origin/released'marha2012-10-117-1026/+1006
|\| | | | | | | | | | | | | | | | | | | | | | | * origin/released: xwininfo mesa git update 11 oct 2012 Conflicts: mesalib/src/mapi/glapi/gen/glX_proto_recv.py mesalib/src/mapi/glapi/gen/glX_proto_size.py mesalib/src/mapi/glapi/gen/glX_server_table.py mesalib/src/mapi/glapi/gen/gl_table.py mesalib/src/mesa/main/.gitignore
| * xwininfo mesa git update 11 oct 2012marha2012-10-117-1026/+1006
| | | | | | | | | | xwininfo: f7b55bdf674fc790e879a2e25ef83925dd8379d6 mesa: 34c58acb59bc0b827e28ef9e89044621ab0b3ee1
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 09:23:41 +0000