aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2014-09-087-9/+27
|\
| * xkeyboard-config mesa git update 8 Sep 2014marha2014-09-087-9/+27
| | | | | | | | | | xkeyboard-config commit 1b9901151cdb22e413319e6fca80fbbfc5e51502 mesa commit 12fb74fe895fe9954df127ca0ec6e4422fffb156
* | Merge remote-tracking branch 'origin/released'marha2014-09-022-8/+26
|\|
| * mesa git update 2 Sep 2014marha2014-09-022-8/+26
| | | | | | | | mesa commit 5a4e0f3873657d874eb5ff52819f42ea38d54b91
* | Merge remote-tracking branch 'origin/released'marha2014-08-305-9/+41
|\| | | | | | | | | Conflicts: xorg-server/hw/kdrive/ephyr/ephyrinit.c
| * xserver libxtrans libxcb xcb-proto libX11 mesa git update 30 Aug 2014marha2014-08-305-9/+41
| | | | | | | | | | | | | | | | | | xserver commit 3a51418b2db353519a1779cf3cebbcc9afba2520 libxcb commit b0e6c2de09c7474868dd7185674fa113a5c2e0aa libxcb/xcb-proto commit dc0c544fe044ddeb4917bba0c2fed66c70e6db43 libX11 commit 6101b967b641355dd863fd1ce52c6a7d58bcbe68 libxtrans commit 17491de45c352c833442cccf17a9bd65909889db mesa commit 932b0ef1ceecf873213447a8778e5cbe1b3b6be7
* | Merge remote-tracking branch 'origin/released'marha2014-08-2235-332/+2282
|\|
| * fontconfig libxcb/xcb-proto mesa xkeyboard-config git update 22 Aug 2014marha2014-08-2235-332/+2282
| | | | | | | | | | | | | | libxcb/xcb-proto commit 8e3db42d67a0035bb16d16da28bd5eea7a269178 xkeyboard-config commit 10fce2c2baae471795d069f3a5f1307eedb9ff0a fontconfig commit 286cdc9c10b0453c25950103b6a1f7170d15bfdc mesa commit 97d03b9366bfa55b27feb92aa5afacd9c5f6f421
* | Compiled and synchronisedmarha2014-08-221-6/+6
| |
* | Merge remote-tracking branch 'origin/released'marha2014-08-1149-5213/+3567
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libxcb/src/c_client.py mesalib/include/GL/glext.h mesalib/include/GL/glxext.h mesalib/src/glsl/.gitignore mesalib/src/mesa/drivers/dri/common/xmlconfig.h mesalib/src/mesa/main/.gitignore xorg-server/Xext/xvmain.c xorg-server/dix/dispatch.c xorg-server/hw/xfree86/common/compiler.h
| * fontconfig libX11 libxcb libxcb/xcb-proto mesa xserver xkeyboard-config git ↵marha2014-08-1149-5213/+3567
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update 11 Aug 2014 xserver commit 3714f5401690b288045090c4bcd9cb01c6e4860e libxcb commit 966fba6ba4838949d0727dfa45eeb9392d1f85d9 libxcb/xcb-proto commit 4b384d2a015c50d0e93dcacda4b8260a3fd37640 xkeyboard-config commit 651a00ab656a1754b9183a383970a735209bbb50 libX11 commit 368a6401c6a3275d3497fec38a3dcbc38cd9df60 libXdmcp commit fe8eab93e9bcdbe8bb8052434bb5e676e3a0ee8f libXext commit efdcbb7634501e1117d422636a0a75d7ea84b16b libfontenc commit 0037a42107b952c9d903719615747e760e4e7247 libXinerama commit edd95182b26eb5d576d4878c559e0f17dddaa909 libXau commit 1e4635be11154dd8262f37b379511bd627defa2a xkbcomp commit d4e02a09258063c6d024c3ccd42d6b22212e6e18 pixman commit 6d2cf40166d81bfc63108504c8022dc4fec37ff5 xextproto commit 66afec3f49e8eb0d4c2e9af7088fc3116d4bafd7 randrproto commit a4a6694c059d74247c16527eef4a0ec9f56bbef6 glproto commit f84853d97d5749308992412a215fa518b6536eb3 mkfontscale commit 47908fd7a0d061fdcd21e3498da4e223ca9136d9 xwininfo commit 017b3736489985999d8dcf4d9e473e1fd6dd3647 libXft commit 214f9b5306d833e2787c75fe41dfdc9228fcb738 libXmu commit 22d9c590901e121936f50dee97dc60c4f7defb63 libxtrans commit a57a7f62242e1ea972b81414741729bf3dbae0a4 fontconfig commit 841753a93f0e5698663b7931b8456e7b96259f54 mesa commit f24be7340162c6a831b392d46d6637e9656e7a8a
* | Merge remote-tracking branch 'origin/released'marha2014-07-2811-24/+443
|\| | | | | | | | | Conflicts: xorg-server/include/servermd.h
| * plink fontconfig libX11 libXext xserver xkeyboard-config mesa git update 28 ↵marha2014-07-2811-24/+443
| | | | | | | | | | | | | | | | | | | | | | | | July 2014 xserver commit 4afedf545b673282f2e214c0e2c759c9be9b9a2a xkeyboard-config commit 9010f6c0745f472b670c22340b5bbd36e33ce37e libX11 commit 0885cad1e4a9ed57266582be320be55259c881bf libXext commit efdcbb7634501e1117d422636a0a75d7ea84b16b fontconfig commit a9e7b0494e04b3925d1bccc140ff2500cfff9618 mesa commit cc1e1da24a6c535617d9fb38858d48d8c2999e68 plink revision 10211
* | Merge remote-tracking branch 'origin/released'marha2014-07-195-16/+58
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/glsl/ir.cpp xorg-server/config/config.c xorg-server/include/callback.h xorg-server/include/colormap.h xorg-server/include/cursor.h xorg-server/include/dix.h xorg-server/include/dixfont.h xorg-server/include/dixgrabs.h xorg-server/include/gc.h xorg-server/include/gcstruct.h xorg-server/include/input.h xorg-server/include/os.h xorg-server/include/pixmap.h xorg-server/include/property.h xorg-server/include/resource.h xorg-server/include/scrnintstr.h xorg-server/include/window.h xorg-server/include/xkbsrv.h xorg-server/mi/mi.h
| * fontconfig plink libX11 libxcb mesa git update 19 July 2014marha2014-07-195-16/+58
| | | | | | | | | | | | | | | | | | plink revision 10207 xserver commit cfa302d6224d10860e60491333950544c4fb9b04 libxcb commit 49a61c8b459ab19c7f39e653bbb0d0339ea8f00f libX11 commit 5525e8433f93bce464412f27cffa203ea628f368 fontconfig commit 6781c6baef062eeea5b5b68e4a9c31ea6cd7539b mesa commit f6fc80734533140a69b30361fe0d4773a03515db
* | Merge remote-tracking branch 'origin/released'marha2014-07-114-16/+20
|\|
| * fontconfig libX11 xserver mkfontscale mesa git update 11 July 2014marha2014-07-114-16/+20
| | | | | | | | | | | | | | | | xserver commit 9de3cc8daa4c6e877d30a0e8ccfe0cc159f1dbe3 libX11 commit ff9a5c199251a84fa59d14fd48dadb3f8920b54b mkfontscale commit 47908fd7a0d061fdcd21e3498da4e223ca9136d9 fontconfig commit dca5d0feee5eb6428bec48b1aff4396cf92c76c0 mesa commit f381c27c548aa28b003c8e188f5d627ab4105f76
* | Merge remote-tracking branch 'origin/released'marha2014-07-044-16/+26
|\|
| * fontconfig mesa pixman xserver git update 4 July 2014marha2014-07-044-16/+26
| | | | | | | | | | | | | | xserver commit a61ca6f006d70343c88fe45206fae0669d1e8971 pixman commit 6d2cf40166d81bfc63108504c8022dc4fec37ff5 fontconfig commit 5b22776999b6052afe0e829b1a0c0935bbe1e9f7 mesa commit 9a37eb8adb6558a4abf47774b583cb582a0ae116
* | Merge remote-tracking branch 'origin/released'marha2014-07-0124-715/+32
|\| | | | | | | | | * origin/released: fontconfig mesa pixman git update 1 July 2014
| * fontconfig mesa pixman git update 1 July 2014marha2014-07-0124-715/+32
| | | | | | | | | | | | pixman commit 5a2edb3f2c2cfde6b25ac614e2004a9f78583d74 fontconfig commit dab60e4476ada4ad4639599ea24dd012d4a79584 mesa commit 1bfc0a11027449ae7ab7c28eb695f26de530eccf
* | Merge remote-tracking branch 'origin/released'marha2014-06-2622-334/+567
|\| | | | | | | | | | | | | | | * origin/released: Opdated to openssl-1.0.1h xkeyboard-config fontconfig libX11 libxcb xcb-proto mesa xserver git update 26 June 2014 Conflicts: openssl/Makefile
| * Opdated to openssl-1.0.1hmarha2014-06-2622-334/+567
| | | | | | | | | | | | | | | | | | | | | | | | xkeyboard-config fontconfig libX11 libxcb xcb-proto mesa xserver git update 26 June 2014 xserver commit a3b44ad8db1fa2f3b81c1ff9498f31c5323edd37 libxcb commit 125135452a554e89e49448e2c1ee6658324e1095 libxcb/xcb-proto commit 84bfd909bc3774a459b11614cfebeaa584a1eb38 xkeyboard-config commit 39a226707b133ab5540c2d30176cb3857e74dcca libX11 commit a4679baaa18142576d42d423afe816447f08336c fontconfig commit 274f2181f294af2eff3e8db106ec8d7bab2d3ff1 mesa commit 9a8acafa47558cafeb37f80f4b30061ac1962c69
* | Merge remote-tracking branch 'origin/released'marha2014-06-085-4/+33
|\| | | | | | | | | | | Conflicts: apps/xwininfo/xwininfo.c xorg-server/hw/xwin/glx/indirect.c
| * xwininfo libX11 mesa mkfontscale xserver git updated 8 June 2014marha2014-06-085-4/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | xserver commit e27a839bf0488d5b1cc2e2a887f2ea0e3d790790 libxcb commit d978a4f69b30b630f28d07f1003cf290284d24d8 libxcb/xcb-proto commit 389889e2f95af19e7fc7ac89e7faeb2f28652415 xkeyboard-config commit bc3ac1b0d152e929b3532a541596cf9fe286bb9e libX11 commit d81fed46144d089bdfa1d916a28dffc9ebffe1e4 libXdmcp commit fe8eab93e9bcdbe8bb8052434bb5e676e3a0ee8f libXext commit 11aad96bd689d54156064d2e81213dc827a689d1 libfontenc commit 0037a42107b952c9d903719615747e760e4e7247 libXinerama commit edd95182b26eb5d576d4878c559e0f17dddaa909 libXau commit 1e4635be11154dd8262f37b379511bd627defa2a xkbcomp commit d4e02a09258063c6d024c3ccd42d6b22212e6e18 pixman commit 9cd283b2eb8279824406bfd47b020d21fc00cf82 xextproto commit 66afec3f49e8eb0d4c2e9af7088fc3116d4bafd7 randrproto commit a4a6694c059d74247c16527eef4a0ec9f56bbef6 glproto commit f84853d97d5749308992412a215fa518b6536eb3 mkfontscale commit 48e541dc2f2fc3f4e99d3e168c28241ff5adff4d xwininfo commit 017b3736489985999d8dcf4d9e473e1fd6dd3647 libXft commit 214f9b5306d833e2787c75fe41dfdc9228fcb738 libXmu commit 22d9c590901e121936f50dee97dc60c4f7defb63 libxtrans commit a57a7f62242e1ea972b81414741729bf3dbae0a4 fontconfig commit f44bfad235e63bb792c38e16ae1fbd281ec1453b mesa commit eb58aa9cf015e79a0fcf2e088676e6aa1d5dabce
* | Merge remote-tracking branch 'origin/released'marha2014-05-234-2/+14
|\| | | | | | | | | | | Conflicts: mesalib/src/mapi/glapi/gen/gl_gentable.py xorg-server/include/servermd.h
| * libX11 mesa xserver pixman git update 23 May 2014marha2014-05-234-2/+14
| | | | | | | | | | | | | | xserver commit db2e708f31a162c6c66643d3559dd5f3e21ee06b libX11 commit e3dc0d17339e61eaf0b51b8907510984e3bf23cb pixman commit 9cd283b2eb8279824406bfd47b020d21fc00cf82 mesa commit 404387ecd72a4a9ace8c1fa6895823aabfd759ad
* | Merge remote-tracking branch 'origin/released'marha2014-05-181-1/+26
|\| | | | | | | | | Conflicts: mesalib/src/glsl/builtin_functions.cpp
| * plink fontconfig mesa xserver xkeyboard-config git update 18 May 2014marha2014-05-182-3/+28
| | | | | | | | | | | | | | | | xserver commit 01e18af17f8dc91451fbd0902049045afd1cea7e xkeyboard-config commit 2bf80b0d9b36fd56acf1f196fb781f045351efaf fontconfig commit 58acd993cb13b58c61633174071ef42da3dcac85 mesa commit 5646319f25c7880b3706bb7590e24c84fd8de0fc plink revision 10192
* | Merge remote-tracking branch 'origin/released'marha2014-05-1139-369/+3524
|\| | | | | | | | | Conflicts: mesalib/src/mesa/main/imports.h
| * mesa git update 11 May 2014marha2014-05-113-1/+8
| | | | | | | | mesa commit 83b4ec03e77645c537d540a12253b3492bad4b59
| * xserver xcb-proto mesa pixman xkeyboard-config git update 7 May 2014marha2014-05-0837-368/+3516
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | xserver commit a5b9757142a2ab471ca26651dce9cc5f5e351f3d libxcb commit d978a4f69b30b630f28d07f1003cf290284d24d8 libxcb/xcb-proto commit 389889e2f95af19e7fc7ac89e7faeb2f28652415 xkeyboard-config commit 3e54f31b1f118f00c240f59d72d7ddb685c6db79 libX11 commit 8be4610939b833587954957f5963eb4191b43d19 libXdmcp commit 089081dca4ba3598c6f9bf401c029378943b5854 libXext commit 11aad96bd689d54156064d2e81213dc827a689d1 libfontenc commit 0037a42107b952c9d903719615747e760e4e7247 libXinerama commit edd95182b26eb5d576d4878c559e0f17dddaa909 libXau commit 1e4635be11154dd8262f37b379511bd627defa2a xkbcomp commit d4e02a09258063c6d024c3ccd42d6b22212e6e18 pixman commit 91f32ce961bc85f98b3372b95681ad8918d24b18 xextproto commit 66afec3f49e8eb0d4c2e9af7088fc3116d4bafd7 randrproto commit a4a6694c059d74247c16527eef4a0ec9f56bbef6 glproto commit f84853d97d5749308992412a215fa518b6536eb3 mkfontscale commit 399db42a151687f1181ae23d28a76d31125a2853 xwininfo commit ba0d1b0da21d2dbdd81098ed5778f3792b472e13 libXft commit 4acfdaf95adb0a05c2a25550bdde036c865902f4 libXmu commit 22d9c590901e121936f50dee97dc60c4f7defb63 libxtrans commit a57a7f62242e1ea972b81414741729bf3dbae0a4 fontconfig commit 81664fe54f117e4781fda5a30429b51858302e91 mesa commit 9ced3fc649ec04710a5f5c855bfb582b898cff83
* | Merge remote-tracking branch 'origin/released'marha2014-05-0111-730/+901
|\| | | | | | | | | | | | | Conflicts: libxcb/src/xcb_util.c mesalib/src/mesa/drivers/dri/common/dri_util.c xorg-server/os/utils.c
| * xkeyboard-config libxcb xserver mesa git update 1 May 2014marha2014-05-0111-730/+901
| | | | | | | | | | | | | | xserver commit 2535b76c0d32bc1dd0ddaca06a419a68a4757df1 libxcb commit d978a4f69b30b630f28d07f1003cf290284d24d8 xkeyboard-config commit 5274a69ee85fb6c425c33c631fa8ea1310a8f097 mesa commit a773fdc64da8ba88d8c7f8e383c45248b0c3aa19
* | Merge remote-tracking branch 'origin/released'marha2014-04-2310-8/+68
|\| | | | | | | | | | | | | Conflicts: mesalib/include/GL/glext.h xorg-server/.gitignore xorg-server/glx/glxext.c
| * fontconfig mesa xserver xkeyboard-config pixman git update 23 Apr 2014marha2014-04-2310-8/+68
| | | | | | | | | | | | | | | | xserver commit 99f0365b1fbdfd9238b9f5cc28491e4e6c7324f1 xkeyboard-config commit b5eb5418e5a9d76b172faadf6901bc9c83f2ddad pixman commit 5f661ee719be25c3aa0eb0d45e0db23a37e76468 fontconfig commit 81664fe54f117e4781fda5a30429b51858302e91 mesa commit fd92346c53ed32709c7b56ce58fb9c9bf43ce9a8
* | Merge remote-tracking branch 'origin/released'marha2014-04-1320-198/+270
|\|
| * fontconfig libxcb mesa xserver xcb-proto git update 13 Apr 2014marha2014-04-1319-189/+255
| | | | | | | | | | | | | | | | | | xserver commit 3028ae6c9aa37168e249e0d847b29f8e3efb05b2 libxcb commit 29e419c5840a1eeda3336a0802686ee723dcaab3 libxcb/xcb-proto commit 70fea02b7d90d86e9d3b0dc5b61406bf4c910999 pixman commit 4b76bbfda670f9ede67d0449f3640605e1fc4df0 fontconfig commit f44157c809d280e2a0ce87fb078fc4b278d24a67 mesa commit 936dda08ee6d7b2be2b016bc06780e401088ec13
| * libxtrans mesa git update 31 Mar 2014marha2014-03-312-12/+18
| | | | | | | | | | libxtrans commit a57a7f62242e1ea972b81414741729bf3dbae0a4 mesa commit d681b22ed77274a805c6c8e81925c18eeb57a968
* | Merge remote-tracking branch 'origin/released'marha2014-03-2821-735/+1379
|\| | | | | | | | | Conflicts: X11/xtrans/Xtrans.c
| * libxtrans fontconfig mesa xserver git update 28 Mar 2014marha2014-03-2821-735/+1379
| | | | | | | | | | | | | | xserver commit a2880699e8f1f576e1a48ebf25e8982463323f84 libxtrans commit 68f60238c4224f954ff6556ae778c72e420175f0 fontconfig commit fcba9ef01c978323fc71c17e455d3cd6ae35edcc mesa commit 029ccd773d01a5f801c809c499516d7b0c4cc3f8
* | Merge remote-tracking branch 'origin/released'marha2014-03-253-1/+59
|\|
| * mesa git update 25 Marc 2014marha2014-03-253-1/+59
| | | | | | | | mesa commit b995a010e688bc4d4557e973e5e28091c378e881
* | Merge remote-tracking branch 'origin/released'marha2014-03-252-16/+21
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/hw/xwin/InitInput.c xorg-server/hw/xwin/InitOutput.c xorg-server/hw/xwin/winglobals.c xorg-server/hw/xwin/winglobals.h xorg-server/hw/xwin/winmsgwindow.c xorg-server/hw/xwin/winmultiwindowwm.c xorg-server/hw/xwin/winmultiwindowwndproc.c
| * fontconfig libxcb mesa xserver git update 24 Mar 2014marha2014-03-242-16/+21
| | | | | | | | | | | | | | xserver commit bf087659f0fb747c471e26c5b287c35877818040 libxcb commit e2813e1cde893f384fa620ff3c13493beebabe0c fontconfig commit 9260b7ec39c34ce68d74e16d47917290a8c3f35a mesa commit 0d99aef6c8a940e52afcbffa7091ff9c854ba120
* | Merge remote-tracking branch 'origin/released'marha2014-03-2110-62/+116
|\| | | | | | | | | | | | | | | | | | | | | | | * origin/released: xserver fontconfig libX11 libXext libxcb mesa git update 21 Mar 2014 Conflicts: libxcb/src/xcb_auth.c libxcb/src/xcb_conn.c libxcb/src/xcb_util.c libxcb/src/xcb_windefs.h mesalib/src/mapi/glapi/glapi.h
| * xserver fontconfig libX11 libXext libxcb mesa git update 21 Mar 2014marha2014-03-2110-62/+116
| | | | | | | | | | | | | | | | | | xserver commit 4fb31e4824d46edc80bb49b4065152899faa5ac6 libxcb commit cb686b576739deea00180c54697c8b62b8419ae0 libX11 commit 8be4610939b833587954957f5963eb4191b43d19 libXext commit 11aad96bd689d54156064d2e81213dc827a689d1 fontconfig commit 5478192f379d784b421329e4bf72cc780818e467 mesa commit 8d8d0cb09eb8735a04fc36cc4d0e2dc9f9d460eb
* | Merge remote-tracking branch 'origin/released'marha2014-03-1210-1253/+1017
|\| | | | | | | | | * origin/released: mesa xserver xkbcomp git update 12 Mar 2014
| * mesa xserver xkbcomp git update 12 Mar 2014marha2014-03-1210-1253/+1017
| | | | | | | | | | | | xserver commit 81a4952d3dcab9ca3a1ee399c773f5ac352036c4 xkbcomp commit d4e02a09258063c6d024c3ccd42d6b22212e6e18 mesa commit 2c886eba7820f7e3e965dd16b786b0a412d8ef11
* | Merge remote-tracking branch 'origin/released'marha2014-03-0918-279/+330
|\| | | | | | | | | | | | | | | | | * origin/released: fontconfig mesa xserver git update 9 Mar 2014 Conflicts: mesalib/src/mapi/glapi/glapi.h xorg-server/hw/kdrive/ephyr/hostx.c
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-20 12:50:53 +0000