aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mapi
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2014-05-115-4/+429
|\ | | | | | | | | Conflicts: mesalib/src/mesa/main/imports.h
| * xserver xcb-proto mesa pixman xkeyboard-config git update 7 May 2014marha2014-05-085-4/+429
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-011-0/+1
|\| | | | | | | | | | | | | 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-011-0/+1
| | | | | | | | | | | | | | xserver commit 2535b76c0d32bc1dd0ddaca06a419a68a4757df1 libxcb commit d978a4f69b30b630f28d07f1003cf290284d24d8 xkeyboard-config commit 5274a69ee85fb6c425c33c631fa8ea1310a8f097 mesa commit a773fdc64da8ba88d8c7f8e383c45248b0c3aa19
* | Merge remote-tracking branch 'origin/released'marha2014-04-1310-239/+180
|\|
| * fontconfig libxcb mesa xserver xcb-proto git update 13 Apr 2014marha2014-04-1310-239/+180
| | | | | | | | | | | | | | | | | | xserver commit 3028ae6c9aa37168e249e0d847b29f8e3efb05b2 libxcb commit 29e419c5840a1eeda3336a0802686ee723dcaab3 libxcb/xcb-proto commit 70fea02b7d90d86e9d3b0dc5b61406bf4c910999 pixman commit 4b76bbfda670f9ede67d0449f3640605e1fc4df0 fontconfig commit f44157c809d280e2a0ce87fb078fc4b278d24a67 mesa commit 936dda08ee6d7b2be2b016bc06780e401088ec13
* | Merge remote-tracking branch 'origin/released'marha2014-03-284-431/+134
|\| | | | | | | | | Conflicts: X11/xtrans/Xtrans.c
| * libxtrans fontconfig mesa xserver git update 28 Mar 2014marha2014-03-284-431/+134
| | | | | | | | | | | | | | xserver commit a2880699e8f1f576e1a48ebf25e8982463323f84 libxtrans commit 68f60238c4224f954ff6556ae778c72e420175f0 fontconfig commit fcba9ef01c978323fc71c17e455d3cd6ae35edcc mesa commit 029ccd773d01a5f801c809c499516d7b0c4cc3f8
* | Merge remote-tracking branch 'origin/released'marha2014-03-211-0/+10
|\| | | | | | | | | | | | | | | | | | | | | | | * 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-212-0/+15
| | | | | | | | | | | | | | | | | | 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-122-7/+7
|\| | | | | | | | | * origin/released: mesa xserver xkbcomp git update 12 Mar 2014
| * mesa xserver xkbcomp git update 12 Mar 2014marha2014-03-122-7/+7
| | | | | | | | | | | | xserver commit 81a4952d3dcab9ca3a1ee399c773f5ac352036c4 xkbcomp commit d4e02a09258063c6d024c3ccd42d6b22212e6e18 mesa commit 2c886eba7820f7e3e965dd16b786b0a412d8ef11
* | Merge remote-tracking branch 'origin/released'marha2014-03-0914-221/+231
|\| | | | | | | | | | | | | | | | | * 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-0914-225/+231
| | | | | | | | | | | | xserver commit 1c61d38528a573caadee2468ee59ea558c822e09 fontconfig commit f8ccf379eb1092592ae0b65deb563c5491f69de9 mesa commit 897f40f25d21af678b1b67c1a68c4a6722d19983
* | Merge remote-tracking branch 'origin/released'marha2014-03-0414-51/+446
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-0413-41/+430
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge remote-tracking branch 'origin/released'marha2014-02-075-1/+64
|\| | | | | | | | | | | | | | | | | * 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-075-1/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge remote-tracking branch 'origin/released'marha2014-01-264-153/+94
|\| | | | | | | | | | | | | | | | | | | * 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-264-153/+94
| | | | | | | | | | | | | | | | | | | | | | | | 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-155-0/+95
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/released: mesa xkeyboard-config xserver git update 15 jan 2014 randrproto libfontenc mesa xserver git update 10 Jan 2014 randsrproto fontconfig libX11 git update 6 Jan 2014 Conflicts: mesalib/src/glsl/builtin_functions.cpp mesalib/src/glsl/ir_builder.h xorg-server/Xext/xres.c xorg-server/dix/dispatch.c xorg-server/dix/dixfonts.c xorg-server/hw/xwin/wingc.c xorg-server/hw/xwin/winwindowswm.c xorg-server/include/gc.h xorg-server/os/access.c
| * mesa xkeyboard-config xserver git update 15 jan 2014marha2014-01-154-0/+93
| | | | | | | | | | | | xserver commit 2d2d49dab5c5718989de97d7227aac793479745e xkeyboard-config commit 78af7aa79c6552924295644b911e45d07a0fcdad mesa commit a05c596a00916ce6a9c9d35ff36cd1e401fddd43
| * randrproto libfontenc mesa xserver git update 10 Jan 2014marha2014-01-101-0/+2
| | | | | | | | | | | | | | xserver commit a92c6406e7f6c0b74fb1cb9361ad904facc0f722 libfontenc commit 0037a42107b952c9d903719615747e760e4e7247 randrproto commit 1755cbe0f501a86afe515f92bb24e417a1866092 mesa commit 532b1fecd93fd30d3b1b101b55fd2c6e074088ad
* | Solved compile problems due to latest mergemarha2013-12-223-0/+103
| |
* | Merge remote-tracking branch 'origin/released'marha2013-12-226-1/+84
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/released: libxtrans fontconfig glproto libX11 libxcb xcbproto mesa xserver pixman xkeyboard-config git update 22 Dec 2013 Conflicts: mesalib/include/GL/glext.h mesalib/src/mesa/drivers/dri/common/dri_util.c mesalib/src/mesa/drivers/dri/swrast/swrast.c xorg-server/damageext/damageext.c xorg-server/dix/dispatch.c xorg-server/glx/glxdriswrast.c xorg-server/glx/indirect_dispatch.c xorg-server/glx/indirect_dispatch_swap.c xorg-server/glx/indirect_program.c xorg-server/glx/render2.c xorg-server/glx/render2swap.c xorg-server/hw/xwin/glx/gen_gl_wrappers.py xorg-server/hw/xwin/glx/glthunk.c xorg-server/hw/xwin/glx/indirect.c xorg-server/include/os.h xorg-server/present/present_request.c
| * libxtrans fontconfig glproto libX11 libxcb xcbproto mesa xserver pixman ↵marha2013-12-226-1/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | xkeyboard-config git update 22 Dec 2013 xserver commit a68df147421da21528b5be2d34678383922fa352 libxcb commit f653464554469b5767f1c99abced25a76bace047 libxcb/xcb-proto commit 4087fc682c5ceb849b74442e17a6b73176e5eecb xkeyboard-config commit a224a636139d22e1dc7ca7d23782cd656e87bcf5 libX11 commit 3d69b0a83e62f8f6fbdd952fc49cdbdf8825e1e6 libXdmcp commit 089081dca4ba3598c6f9bf401c029378943b5854 libXext commit bb24f2970f2e425f4df90c9b73d078ad15a73fbb libfontenc commit 3acba630d8b57084f7e92c15732408711ed5137a libXinerama commit edd95182b26eb5d576d4878c559e0f17dddaa909 libXau commit 304a11be4727c5a7feeb2501e8e001466f8ce84e xkbcomp commit e3e6e938535532bfad175c1635256ab7fb3ac943 pixman commit 945ab7a6f3eb6241f07e8f094dc0e647d1f10d9d xextproto commit 3f355f138d6df57e067458a20f47307883048adb randrproto commit e7526e6b5fe0966929cda10b2ded0258413744db glproto commit f84853d97d5749308992412a215fa518b6536eb3 mkfontscale commit 880a0c4733e62e54e6a0f1238c7430727d23657b xwininfo commit ba0d1b0da21d2dbdd81098ed5778f3792b472e13 libXft commit 4acfdaf95adb0a05c2a25550bdde036c865902f4 libXmu commit 22d9c590901e121936f50dee97dc60c4f7defb63 libxtrans commit 2c0a7840a28ae696e80e73157856d7a049fdf6c7 fontconfig commit 5c725f2f5829238d16116f782d00d8bb0defaf08 mesa commit 2efe7927d38983029784825fc4897e9b77aa237e
* | Merge remote-tracking branch 'origin/released'marha2013-11-263-1/+49
|\| | | | | | | | | * origin/released: xkeyboard-config mesa git update 26 nov 2013
| * xkeyboard-config mesa git update 26 nov 2013marha2013-11-263-1/+49
| | | | | | | | | | xkeyboard-config commit aaf4edebf7de3c2b5188a4f25a8901d274ea3400 mesa commit ddc77c5092b6f782327a7014b320f31f5f4e8e93
* | Solved problem of freeing invalid pointermarha2013-11-121-11/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2013-11-084-6/+70
|\| | | | | | | | | | | | | | | | | | | | | | | * origin/released: Added presentproto-1.0 libxtrans libxcb xcb-proto mesa git update 8 nov 2013 Conflicts: X11/xtrans/Xtransint.h X11/xtrans/Xtranssock.c libxcb/src/.gitignore mesalib/src/mesa/drivers/dri/common/dri_util.c
| * libxtrans libxcb xcb-proto mesa git update 8 nov 2013marha2013-11-084-6/+70
| | | | | | | | | | | | | | libxcb commit e8663a935890ff366f49e356211049dfd0d9756a libxcb/xcb-proto commit 29beba6bf02bda86a5b163ace63e1d0a4d3eee5b libxtrans commit 0153d1670e4a1883e1bb6dd971435d6268eac5ba mesa commit 035cce83f7b3d9a037c9e7cc17a212d6cf7e927f
* | Merge remote-tracking branch 'origin/released'marha2013-11-074-2/+47
|\| | | | | | | | | | | | | | | | | * origin/released: libxtrans fontconfig mesa xserver pixman xkbcomp git update 4 nov 2013 Conflicts: xorg-server/Xext/shm.c xorg-server/os/xstrans.c
| * libxtrans fontconfig mesa xserver pixman xkbcomp git update 4 nov 2013marha2013-11-044-2/+47
| | | | | | | | | | | | | | | | | | xserver commit 33c85beed521c9db140cadd8c5aa9992398ee1fe xkbcomp commit e3e6e938535532bfad175c1635256ab7fb3ac943 pixman commit 8cbc7da4e525c96a8e089e4c1baee75dc8315218 libxtrans commit 1fb0fd555a16dd8fce4abc6d3fd22b315f46762a fontconfig commit 767108aa1327cf0156dfc6f024dbc8fb783ae067 mesa commit 2f896627175384fd5943f21804700a155ba4e8a0
* | Merge remote-tracking branch 'origin/released'marha2013-11-046-3/+127
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/released: fontconfig glproto libX11 mesa xserver xkeyboard-config git update 31 oct 2013 Conflicts: xorg-server/glx/dispatch.h xorg-server/glx/glapi.c xorg-server/glx/glapi.h xorg-server/glx/glapi_gentable.c xorg-server/glx/glapitable.h xorg-server/glx/glprocs.h xorg-server/glx/glxcmdsswap.c xorg-server/glx/glxdri.c xorg-server/glx/glxext.c xorg-server/glx/glxext.h xorg-server/glx/indirect_dispatch.c xorg-server/glx/indirect_dispatch.h xorg-server/glx/indirect_dispatch_swap.c xorg-server/glx/indirect_reqsize.c xorg-server/glx/indirect_reqsize.h xorg-server/glx/indirect_size.h xorg-server/glx/indirect_size_get.c xorg-server/glx/indirect_size_get.h xorg-server/glx/indirect_table.c xorg-server/glx/indirect_texture_compression.c xorg-server/glx/render2.c xorg-server/glx/render2swap.c
| * fontconfig glproto libX11 mesa xserver xkeyboard-config git update 31 oct 2013marha2013-10-316-3/+127
| | | | | | | | | | | | | | | | | | xserver commit 902ff0b3497d202b86bf9a411e17db7b694d6eaa xkeyboard-config commit 70bbf18d6cddb7271db1b2e042765ace3c4ac485 libX11 commit 6cb02b166361200da35ba14f52cd9aaa493eb0ea glproto commit aacc7a51b6161c765b04524e0d2ab31e5e586834 fontconfig commit 525a135ccf53e4bf3363c3143d9cfdf15fba55ab mesa commit b16b3c8703f198ca0f025b730d582600df79c19c
* | Merge remote-tracking branch 'origin/released'marha2013-10-241-32/+0
|\| | | | | | | | | | | | | | | * 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-241-32/+0
| | | | | | | | | | | | xserver commit 7ecfab47eb221dbb996ea6c033348b8eceaeb893 fontconfig commit 76ea9af816a50c6bb0b3dc2960460a90fadd9cdb mesa commit a6e45b6a17462f4d261a2d176791469847356923
* | Merge remote-tracking branch 'origin/released'marha2013-10-182-2/+10
|\| | | | | | | | | | | | | | | | | * 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-182-2/+10
| | | | | | | | | | pixman commit 3c2f4b651747c1ac484c39d5128cae5483094342 mesa commit 9aad1ba70fad7bfa45778faa5a91235f8302264f
* | Merge remote-tracking branch 'origin/released'marha2013-10-162-2/+2
|\| | | | | | | | | | | | | | | | | * 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-162-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | 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-033-1/+18
|\| | | | | | | | | | | | | | | | | * 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-033-1/+18
| | | | | | | | | | xkeyboard-config commit 7c7f937a2203bdcdc3b2e7cbe55ddfc34cffe3ab mesa commit d1335926196c216f1abe73f37cfcb61cf7f2bd28
* | Merge remote-tracking branch 'origin/released'marha2013-09-304-0/+91
|\| | | | | | | | | * 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-304-0/+91
| | | | | | | | | | | | | | | | xkeyboard-config commit fe5c2416314fd1df423c8ce53cac2d28b00420e7 libXau commit 304a11be4727c5a7feeb2501e8e001466f8ce84e pixman commit b513b3dffe979056dbbbdc8e0659f8018c51c5f5 fontconfig commit 9161ed1e4a3f4afaee6dbcfc0b84a279ad99b397 mesa commit 868791f0baa0b51f4255c839448d3ca87ab1aa35
* | Merge remote-tracking branch 'origin/released'marha2013-09-251-71/+25
|\| | | | | | | | | * origin/released: fontconfig mesa git update 25 Sep 2013
| * fontconfig mesa git update 25 Sep 2013marha2013-09-251-71/+25
| | | | | | | | | | fontconfig commit 102864d0dba46c99b22c912454c1f58731287405 mesa commit 59157d1c96f33ca56d9aba6cff75145d732dbbab
* | Merge remote-tracking branch 'origin/released'marha2013-09-042-1/+149
|\| | | | | | | | | * origin/released: fontconfig xkeyboard-config git update 4 Sep 2013
| * fontconfig xkeyboard-config git update 4 Sep 2013marha2013-09-042-1/+149
| | | | | | | | | | | | xkeyboard-config commit 8f49c92c54c53eab6d40d8be90ce06773d20d196 fontconfig commit 6720892e97f11fbe8d69ae5b3875d928c68ff90e mesa commit 51a279254fecc05691524dab1bf291c7dfefccd5
* | Merge remote-tracking branch 'origin/released'marha2013-08-261-4/+4
|\| | | | | | | | | * origin/released: xserver mesa fontconfig libX11 libxcb libxcb/xcb-proto xkeyboard-config git update 26 Aug 2013