aboutsummaryrefslogtreecommitdiff
path: root/mesalib
Commit message (Collapse)AuthorAgeFilesLines
* Update project files to solved compilation problems due to latest mergemarha2014-06-264-0/+8
|
* Merge remote-tracking branch 'origin/released'marha2014-06-2687-787/+2348
|\ | | | | | | | | | | | | | | * 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-2687-787/+2348
| | | | | | | | | | | | | | | | | | | | | | | | 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-0839-325/+956
|\| | | | | | | | | | | Conflicts: apps/xwininfo/xwininfo.c xorg-server/hw/xwin/glx/indirect.c
| * xwininfo libX11 mesa mkfontscale xserver git updated 8 June 2014marha2014-06-0839-325/+956
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2912-41/+80
|\| | | | | | | | | Conflicts: mesalib/src/mesa/drivers/dri/common/dri_util.c
| * mesa xkeyboard-config git update 29 Mar 2014marha2014-05-2912-41/+80
| | | | | | | | | | xkeyboard-config commit bc3ac1b0d152e929b3532a541596cf9fe286bb9e mesa commit dfd117b8570a69a429e660c069997e78b181ab6d
* | Merge remote-tracking branch 'origin/released'marha2014-05-2326-116/+429
|\| | | | | | | | | | | Conflicts: mesalib/src/mapi/glapi/gen/gl_gentable.py xorg-server/include/servermd.h
| * libX11 mesa xserver pixman git update 23 May 2014marha2014-05-2326-116/+429
| | | | | | | | | | | | | | xserver commit db2e708f31a162c6c66643d3559dd5f3e21ee06b libX11 commit e3dc0d17339e61eaf0b51b8907510984e3bf23cb pixman commit 9cd283b2eb8279824406bfd47b020d21fc00cf82 mesa commit 404387ecd72a4a9ace8c1fa6895823aabfd759ad
* | Solved compile problem due to latest mergemarha2014-05-231-2/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2014-05-1818-223/+445
|\| | | | | | | | | Conflicts: mesalib/src/glsl/builtin_functions.cpp
| * plink fontconfig mesa xserver xkeyboard-config git update 18 May 2014marha2014-05-1819-225/+447
| | | | | | | | | | | | | | | | xserver commit 01e18af17f8dc91451fbd0902049045afd1cea7e xkeyboard-config commit 2bf80b0d9b36fd56acf1f196fb781f045351efaf fontconfig commit 58acd993cb13b58c61633174071ef42da3dcac85 mesa commit 5646319f25c7880b3706bb7590e24c84fd8de0fc plink revision 10192
* | Merge remote-tracking branch 'origin/released'marha2014-05-1185-834/+5762
|\| | | | | | | | | Conflicts: mesalib/src/mesa/main/imports.h
| * mesa git update 11 May 2014marha2014-05-118-19/+76
| | | | | | | | mesa commit 83b4ec03e77645c537d540a12253b3492bad4b59
| * xserver xcb-proto mesa pixman xkeyboard-config git update 7 May 2014marha2014-05-0883-815/+5686
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0151-1034/+1412
|\| | | | | | | | | | | | | 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-0151-1034/+1412
| | | | | | | | | | | | | | xserver commit 2535b76c0d32bc1dd0ddaca06a419a68a4757df1 libxcb commit d978a4f69b30b630f28d07f1003cf290284d24d8 xkeyboard-config commit 5274a69ee85fb6c425c33c631fa8ea1310a8f097 mesa commit a773fdc64da8ba88d8c7f8e383c45248b0c3aa19
* | Solved compile problems due to latest mergemarha2014-04-231-3/+3
| |
* | Merge remote-tracking branch 'origin/released'marha2014-04-2336-1103/+1705
|\| | | | | | | | | | | | | 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-2336-1107/+1764
| | | | | | | | | | | | | | | | xserver commit 99f0365b1fbdfd9238b9f5cc28491e4e6c7324f1 xkeyboard-config commit b5eb5418e5a9d76b172faadf6901bc9c83f2ddad pixman commit 5f661ee719be25c3aa0eb0d45e0db23a37e76468 fontconfig commit 81664fe54f117e4781fda5a30429b51858302e91 mesa commit fd92346c53ed32709c7b56ce58fb9c9bf43ce9a8
* | Merge remote-tracking branch 'origin/released'marha2014-04-1392-2981/+3223
|\|
| * fontconfig libxcb mesa xserver xcb-proto git update 13 Apr 2014marha2014-04-1388-2947/+3103
| | | | | | | | | | | | | | | | | | 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-319-42/+128
| | | | | | | | | | libxtrans commit a57a7f62242e1ea972b81414741729bf3dbae0a4 mesa commit d681b22ed77274a805c6c8e81925c18eeb57a968
* | Merge remote-tracking branch 'origin/released'marha2014-03-2914-26/+25
|\|
| * xserver mesa git update 29 Mar 2014marha2014-03-2914-26/+25
| | | | | | | | | | xserver commit 8468e24430988058b150dc1daef3aad6ba9fa698 mesa commit 9b6b084eb7b10d006b44e3cd22585fc3e39e0c00
* | Merge remote-tracking branch 'origin/released'marha2014-03-2851-1499/+1858
|\| | | | | | | | | Conflicts: X11/xtrans/Xtrans.c
| * libxtrans fontconfig mesa xserver git update 28 Mar 2014marha2014-03-2851-1499/+1858
| | | | | | | | | | | | | | xserver commit a2880699e8f1f576e1a48ebf25e8982463323f84 libxtrans commit 68f60238c4224f954ff6556ae778c72e420175f0 fontconfig commit fcba9ef01c978323fc71c17e455d3cd6ae35edcc mesa commit 029ccd773d01a5f801c809c499516d7b0c4cc3f8
* | Merge remote-tracking branch 'origin/released'marha2014-03-254-1/+64
|\|
| * mesa git update 25 Marc 2014marha2014-03-254-1/+64
| | | | | | | | mesa commit b995a010e688bc4d4557e973e5e28091c378e881
* | Merge remote-tracking branch 'origin/released'marha2014-03-253-16/+31
|\| | | | | | | | | | | | | | | | | | | | | 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-243-16/+31
| | | | | | | | | | | | | | xserver commit bf087659f0fb747c471e26c5b287c35877818040 libxcb commit e2813e1cde893f384fa620ff3c13493beebabe0c fontconfig commit 9260b7ec39c34ce68d74e16d47917290a8c3f35a mesa commit 0d99aef6c8a940e52afcbffa7091ff9c854ba120
* | Merge remote-tracking branch 'origin/released'marha2014-03-2144-1809/+1300
|\| | | | | | | | | | | | | | | | | | | | | | | * 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-2145-1809/+1305
| | | | | | | | | | | | | | | | | | 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-1241-2078/+1763
|\| | | | | | | | | * origin/released: mesa xserver xkbcomp git update 12 Mar 2014
| * mesa xserver xkbcomp git update 12 Mar 2014marha2014-03-1241-2078/+1763
| | | | | | | | | | | | xserver commit 81a4952d3dcab9ca3a1ee399c773f5ac352036c4 xkbcomp commit d4e02a09258063c6d024c3ccd42d6b22212e6e18 mesa commit 2c886eba7820f7e3e965dd16b786b0a412d8ef11
* | Merge remote-tracking branch 'origin/released'marha2014-03-0964-1016/+1349
|\| | | | | | | | | | | | | | | | | * origin/released: fontconfig mesa xserver git update 9 Mar 2014 Conflicts: mesalib/src/mapi/glapi/glapi.h xorg-server/hw/kdrive/ephyr/hostx.c
| * fontconfig mesa xserver git update 9 Mar 2014marha2014-03-0963-1023/+1374
| | | | | | | | | | | | xserver commit 1c61d38528a573caadee2468ee59ea558c822e09 fontconfig commit f8ccf379eb1092592ae0b65deb563c5491f69de9 mesa commit 897f40f25d21af678b1b67c1a68c4a6722d19983
* | Merge remote-tracking branch 'origin/released'marha2014-03-04162-3053/+7623
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/released: libX11 libxcb mesa xserver xcb-proto xkeyboard-config git update 4 Mar 2014 Conflicts: mesalib/src/mapi/glapi/glapi.h mesalib/src/mapi/glapi/glthread.c mesalib/src/mesa/drivers/dri/common/dri_util.c mesalib/src/mesa/main/bufferobj.c xorg-server/dix/dispatch.c xorg-server/hw/xwin/glx/gen_gl_wrappers.py xorg-server/hw/xwin/winmultiwindowwm.c
| * libX11 libxcb mesa xserver xcb-proto xkeyboard-config git update 4 Mar 2014marha2014-03-04154-3031/+7506
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | xserver commit b634e909895f6001e7d9543e1350b20c82c8c01c libxcb commit 4ffa6f83b92763eb901c7ddb7c20775e24d507ca libxcb/xcb-proto commit 4270141a7cb3c68f50251be19a5a628aa18553e6 xkeyboard-config commit d9e3d0ec1a48a5f61ea6dd6d20b8682eeecf3a39 libX11 commit d6bd988bc00494914b38b95ee5df77ac4f32f19f libXdmcp commit 089081dca4ba3598c6f9bf401c029378943b5854 libXext commit d5447c0156f556114dbf97d6064c0c7b0fcd5f70 libfontenc commit 0037a42107b952c9d903719615747e760e4e7247 libXinerama commit edd95182b26eb5d576d4878c559e0f17dddaa909 libXau commit 1e4635be11154dd8262f37b379511bd627defa2a xkbcomp commit 31b90ee4ffc774e0da540277907fc5540c0b012c pixman commit 82d094654a46bd97d47f1f132a01ae0a74b986f3 xextproto commit 66afec3f49e8eb0d4c2e9af7088fc3116d4bafd7 randrproto commit a4a6694c059d74247c16527eef4a0ec9f56bbef6 glproto commit f84853d97d5749308992412a215fa518b6536eb3 mkfontscale commit eac564e0fc9052a39981ea47b271f7f3d2821944 xwininfo commit ba0d1b0da21d2dbdd81098ed5778f3792b472e13 libXft commit 4acfdaf95adb0a05c2a25550bdde036c865902f4 libXmu commit 22d9c590901e121936f50dee97dc60c4f7defb63 libxtrans commit 3f0de269abe59353acbd7a5587d68ce0da91db67 fontconfig commit e310d2fac2d874d5aa76c609df70cc7b871c0b6d mesa commit 1a568e0f2b65e4e1e1d19a6dece3a792a33da825
* | Synchronised files and added missing files in mesa projectmarha2014-02-102-0/+12
| |
* | Merge remote-tracking branch 'origin/released'marha2014-02-07156-4438/+6269
|\| | | | | | | | | | | | | | | | | * origin/released: xkbcomp xkeyboard-config libxcb libxtrans fontconfig libX11 libxcb mesa xserver git update 7 Feb 2014 Conflicts: mesalib/src/glsl/glcpp/glcpp.c openssl/Makefile
| * xkbcomp xkeyboard-config libxcb libxtrans fontconfig libX11 libxcb mesa ↵marha2014-02-07156-4438/+6269
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | xserver git update 7 Feb 2014 Update to openssl1.0.1f xserver commit 83e38eb73fd8c852513aac2da2975b4c01070ec2 libxcb commit d7eb0bdf3b5b11ee9f40ee5e73df8fc0bdfa59f3 xkeyboard-config commit 7596672b96315465df8d8d691e3a567a52f70743 libX11 commit aacf95dacc7c598e7297894580d4d655593813b2 xkbcomp commit 31b90ee4ffc774e0da540277907fc5540c0b012c libxtrans commit 3f0de269abe59353acbd7a5587d68ce0da91db67 fontconfig commit e310d2fac2d874d5aa76c609df70cc7b871c0b6d mesa commit dd2229d4c68ed78a50104637aef904f8ab6d7dd3
* | Synchronised files and updated mesa project filemarha2014-01-274-0/+8
| |
* | Merge remote-tracking branch 'origin/released'marha2014-01-26117-5341/+6824
|\| | | | | | | | | | | | | | | | | | | * origin/released: xserver randrproto libxtrans fontconfig libxcb xcb-proto mesa git update 26 Jan 2014 Conflicts: X11/xtrans/Xtrans.c xorg-server/dix/dispatch.c xorg-server/os/xdmcp.c
| * xserver randrproto libxtrans fontconfig libxcb xcb-proto mesa git update 26 ↵marha2014-01-26117-5341/+6824
| | | | | | | | | | | | | | | | | | | | | | | | Jan 2014 xserver commit c1ce807d9f18f215332d7eeb844e8c640f71c53c libxcb commit e7263931aff3e3450dc938ad465a7577f943549f libxcb/xcb-proto commit d898fd39ad6c82207eb78666b2daad982dd757b5 randrproto commit a4a6694c059d74247c16527eef4a0ec9f56bbef6 libxtrans commit e1e6121a1638d43d9929589b4723da2b38cb6b44 fontconfig commit e2b406053c2937799da8636c56b72a77998bcab0 mesa commit 07149f0252c52b4ac58b6df4e307fd786b49b490
* | Merge remote-tracking branch 'origin/released'marha2014-01-206-25/+40
|\| | | | | | | | | | | | | | | | | | | | | | | | | * origin/released: ligXext mesa git update 20 Jan 2014 fontconfig mesa git update 19 Jan 2013 Conflicts: mesalib/src/loader/Android.mk mesalib/src/loader/Makefile.am mesalib/src/loader/SConscript mesalib/src/loader/loader.c tools/mhmake/config.guess
| * ligXext mesa git update 20 Jan 2014marha2014-01-206-25/+40
| | | | | | | | | | libXext commit d5447c0156f556114dbf97d6064c0c7b0fcd5f70 mesa commit 799abb271a248f646faa5cc859968f8c71e1ef16
| * fontconfig mesa git update 19 Jan 2013marha2014-01-19188-336/+826
| | | | | | | | | | fontconfig commit 5918d5bea5416cf27061db4263aefeb8fd310f0e mesa commit a33d1339d5bfb32377be92957a493f0e3d84b31e
* | fontconfig mesa git update 19 Jan 2013marha2014-01-20188-336/+826
| | | | | | | | | | fontconfig commit 5918d5bea5416cf27061db4263aefeb8fd310f0e mesa commit a33d1339d5bfb32377be92957a493f0e3d84b31e
* | Solved compiler errors and warningsmarha2014-01-153-1/+5
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 13:50:46 +0000