aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2013-11-2914-24/+190
|\ | | | | | | | | * origin/released: fontconfig mesa xserver git update 29 Nov 2013
| * fontconfig mesa xserver git update 29 Nov 2013marha2013-11-2914-24/+190
| | | | | | | | | | | | xserver commit d695cb7fb6bb8fd159a332d902673edbbd2237d7 fontconfig commit a5fd7912ff8c7bc72d2cdbd0038c7ff0c968831f mesa commit fb5f5b81883f360dcbbf407a0f6f5606bc0c0495
* | Synchronised filesmarha2013-11-265-3429/+3491
| |
* | Merge remote-tracking branch 'origin/released'marha2013-11-2632-32/+662
|\| | | | | | | | | * origin/released: xkeyboard-config mesa git update 26 nov 2013
| * xkeyboard-config mesa git update 26 nov 2013marha2013-11-2632-32/+662
| | | | | | | | | | xkeyboard-config commit aaf4edebf7de3c2b5188a4f25a8901d274ea3400 mesa commit ddc77c5092b6f782327a7014b320f31f5f4e8e93
* | Merge remote-tracking branch 'origin/released'marha2013-11-2598-4656/+324
|\| | | | | | | | | | | | | | | * origin/released: libX11 xserver mesa libXinerama libXmu mkfontscale git update 25 nov 2013 Conflicts: libXinerama/src/Xinerama.c
| * libX11 xserver mesa libXinerama libXmu mkfontscale git update 25 nov 2013marha2013-11-2587-4508/+302
| | | | | | | | | | | | | | | | | | xserver commit 80481267662c8687e73081237913fa561e7a6561 libX11 commit 1e43c262d13cab2b759665f9f13bdedbc7afbfd4 libXinerama commit edd95182b26eb5d576d4878c559e0f17dddaa909 mkfontscale commit 880a0c4733e62e54e6a0f1238c7430727d23657b libXmu commit e02c30fac32e4873240e507cadc416f710188feb mesa commit 72cae2a599881e926b8709f4dfa2cc3591ea7a02
* | Merge remote-tracking branch 'origin/released'marha2013-11-2218-92/+310
|\| | | | | | | | | * origin/released: libxtrans mesa git update 22 nov 2013
| * libxtrans mesa git update 22 nov 2013marha2013-11-2218-92/+310
| | | | | | | | | | libxtrans commit 8b2c8aabe27bcaa4de6432b53c4a1296010ea823 mesa commit bb354c6c279031dafc08029a62cd3e76a6c1ca71
* | mesa: solved 32-bit compilation problems1.14.4marha2013-11-212-6/+6
| |
* | Switched version to 1.14.4marha2013-11-217-6/+1073
| |
* | Synchronised xcbext.h and solved compiler warnings.marha2013-11-213-5/+4
| |
* | Merge remote-tracking branch 'origin/released'marha2013-11-2115-33/+127
|\| | | | | | | | | * origin/released: xserver mesa git update 21 nov 2013
| * xserver mesa git update 21 nov 2013marha2013-11-2115-33/+127
| | | | | | | | | | xserver commit 6403cbb143c67872ca9c58e3116ae7942def0ae1 mesa commit b7c0b61782251c1dedb0b0fb0e6654af81249910
* | Merge remote-tracking branch 'origin/released'marha2013-11-1914-190/+223
|\| | | | | | | | | * origin/released: libxcb xcb-proto xserver mesa git update 19 nov 2013
| * libxcb xcb-proto xserver mesa git update 19 nov 2013marha2013-11-1914-190/+223
| | | | | | | | | | | | | | xserver commit da9997f89f14ab619f244d5b2e80a423b028c789 libxcb commit 5d1dbb468bb0f834eaa8adea6daf6729808ca429 libxcb/xcb-proto commit 281790373e625cc1e9f67b39fe0d687f279edbfb mesa commit 21ae5135dd30bbd2ec7d2b44e07b6cb1d6425d9e
* | Solved link error due to latest mergemarha2013-11-185-0/+9
| |
* | Merge remote-tracking branch 'origin/released'marha2013-11-1849-370/+881
|\| | | | | | | | | | | | | | | * origin/released: libXext mesa xkeyboard-config pixman 18 nov 2013 Conflicts: libXext/src/eat.h
| * libXext mesa xkeyboard-config pixman 18 nov 2013marha2013-11-1849-366/+881
| | | | | | | | | | | | | | xkeyboard-config commit 51ab5c95e48b2a040fc132bb5c1a5e8bbe86c8f4 libXext commit bb24f2970f2e425f4df90c9b73d078ad15a73fbb pixman commit f473fd1e7553a4e92a0d72bea360f05d005c9a88 mesa commit 2cfbf84dadc915b7075a3f1cbb569daf699d5ff0
* | Merge remote-tracking branch 'origin/released'marha2013-11-1516-63/+135
|\| | | | | | | | | | | | | | | * origin/released: xcb-proto mesa xserver git update 15 nov 2013 Conflicts: xorg-server/mi/mieq.c
| * xcb-proto mesa xserver git update 15 nov 2013marha2013-11-1517-64/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | xserver commit 29240e5cbf6e7f875b128fc7bfc4d56b2350835a libxcb commit e8663a935890ff366f49e356211049dfd0d9756a libxcb/xcb-proto commit 7c85d67b1b2edc421d889f9c5c3873e163363e7a xkeyboard-config commit 70bbf18d6cddb7271db1b2e042765ace3c4ac485 libX11 commit 6cb02b166361200da35ba14f52cd9aaa493eb0ea libXdmcp commit 089081dca4ba3598c6f9bf401c029378943b5854 libXext commit 7378d4bdbd33ed49ed6cfa5c4f73d7527982aab4 libfontenc commit 3acba630d8b57084f7e92c15732408711ed5137a libXinerama commit 6e1d1dc328ba8162bba2f4694e7f3c706a1491ff libXau commit 304a11be4727c5a7feeb2501e8e001466f8ce84e xkbcomp commit e3e6e938535532bfad175c1635256ab7fb3ac943 pixman commit 8487dfbcd056eff066939dc253fcf361b391592a xextproto commit 3f355f138d6df57e067458a20f47307883048adb randrproto commit e7526e6b5fe0966929cda10b2ded0258413744db glproto commit aacc7a51b6161c765b04524e0d2ab31e5e586834 mkfontscale commit f48de13423c7300f4da9f61993b624426b38ddc0 xwininfo commit ba0d1b0da21d2dbdd81098ed5778f3792b472e13 libXft commit c5e760a239afc62a1c75e0509868e35957c8df52 libXmu commit 2539e539eafdac88177c8ee30b043c5d52f017e4 libxtrans commit 0153d1670e4a1883e1bb6dd971435d6268eac5ba fontconfig commit 38acb08d9778ebad2bfc3407532adf8f2e8e667e mesa commit 78fc159d68becdf4c04d35e3d21917ae45b839ba
* | Merge remote-tracking branch 'origin/released'marha2013-11-1416-37/+1003
|\| | | | | | | | | * origin/released: mesa xserver git update 14 nov 2013
| * mesa xserver git update 14 nov 2013marha2013-11-1416-37/+1003
| | | | | | | | | | xserver commit 0ba7fc8472f1227fd1cd51bd58048f164b8ea1ab mesa commit a15a19f0d1b024f5f18f1dfe878ae8d399e38469
* | Merge remote-tracking branch 'origin/released'marha2013-11-1434-93/+502
|\| | | | | | | | | | | | | | | | | * origin/released: mesa xserver pixman git update 9 nov 2013 Conflicts: mesalib/src/mesa/drivers/dri/common/dri_util.c xorg-server/Xext/shm.c
| * mesa xserver pixman git update 9 nov 2013marha2013-11-1333-85/+498
| | | | | | | | | | | | xserver commit 4a251f5883b042cd902c192060a0be2b11148f2b pixman commit 8487dfbcd056eff066939dc253fcf361b391592a mesa commit e0489531455623aa21aa565b2c890362d8437f23
* | Now use visual studio 2013 express edition for compilationmarha2013-11-1235-117/+128
| |
* | Merge remote-tracking branch 'origin/released'marha2013-11-1288-487/+3754
|\| | | | | | | | | | | | | | | * origin/released: Updated zlib to 1.2.8 Conflicts: zlib/win32/zlib.def
| * Updated zlib to 1.2.8marha2013-11-1289-487/+3756
| |
* | Solved problem of freeing invalid pointermarha2013-11-122-13/+2
| |
* | Generate map filemarha2013-11-121-1/+1
| |
* | Do not call gl functions directlymarha2013-11-123-25/+49
| |
* | Merge remote-tracking branch 'origin/released'marha2013-11-128-27/+47
|\| | | | | | | | | | | | | | | * origin/released: pixman mesa fontconfig git update 12 nov 2013 Conflicts: mesalib/src/mesa/drivers/dri/swrast/swrast.c
| * pixman mesa fontconfig git update 12 nov 2013marha2013-11-128-25/+46
| | | | | | | | | | | | pixman commit 741007311087be8a711cc9c76ec00e59a156c850 fontconfig commit 38acb08d9778ebad2bfc3407532adf8f2e8e667e mesa commit 594fa4a208b138b0b9b24cc8de62e6681ebb8d21
* | Solved compilation and run-time problems after latest mergemarha2013-11-0826-3153/+3543
| |
* | Merge remote-tracking branch 'origin/released'marha2013-11-08122-492/+4337
|\| | | | | | | | | | | | | | | | | | | | | | | * 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
| * Added presentproto-1.0marha2013-11-085-0/+1088
| |
| * libxtrans libxcb xcb-proto mesa git update 8 nov 2013marha2013-11-0880-494/+3238
| | | | | | | | | | | | | | libxcb commit e8663a935890ff366f49e356211049dfd0d9756a libxcb/xcb-proto commit 29beba6bf02bda86a5b163ace63e1d0a4d3eee5b libxtrans commit 0153d1670e4a1883e1bb6dd971435d6268eac5ba mesa commit 035cce83f7b3d9a037c9e7cc17a212d6cf7e927f
* | Solved compilation and link problems after last mergemarha2013-11-0856-10882/+31295
| |
* | Merge remote-tracking branch 'origin/released'marha2013-11-0747-336/+750
|\| | | | | | | | | | | | | | | * origin/released: xextproto fontconfig libxcb mesa xserver git update 7 Nov 2013 Conflicts: xorg-server/include/servermd.h
| * xextproto fontconfig libxcb mesa xserver git update 7 Nov 2013marha2013-11-0747-336/+750
| | | | | | | | | | | | | | | | | | xserver commit ab4b1fb38a61feb73d8336cc7a3399eb9d3d25be libxcb commit e4e0c6eec861f4c69da12060dc8dbe7a63fa5eb6 libxcb/xcb-proto commit 530817c5a926f006d8d61f9dcfd9ab73269a9805 xextproto commit 3f355f138d6df57e067458a20f47307883048adb fontconfig commit a4443e64c89256087d40462cfbb482950873e366 mesa commit 110009302bddb4c42a5b3ed5ca451d6bb50a06a0
* | Merge remote-tracking branch 'origin/released'marha2013-11-07126-375/+5282
|\| | | | | | | | | | | | | | | | | * 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-04126-373/+5280
| | | | | | | | | | | | | | | | | | 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-04135-40932/+10860
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-31133-43039/+5799
| | | | | | | | | | | | | | | | | | xserver commit 902ff0b3497d202b86bf9a411e17db7b694d6eaa xkeyboard-config commit 70bbf18d6cddb7271db1b2e042765ace3c4ac485 libX11 commit 6cb02b166361200da35ba14f52cd9aaa493eb0ea glproto commit aacc7a51b6161c765b04524e0d2ab31e5e586834 fontconfig commit 525a135ccf53e4bf3363c3143d9cfdf15fba55ab mesa commit b16b3c8703f198ca0f025b730d582600df79c19c
* | Solved mesa compilation errorsmarha2013-10-255-10/+15
| |
* | Merge remote-tracking branch 'origin/released'marha2013-10-2528-233/+744
|\| | | | | | | | | | | | | | | | | * 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-2528-230/+741
| | | | | | | | | | fontconfig commit 65872e9e46d17e4461c3a891ef23abe156005e04 mesa commit e8f6f244bb1963c4af81f431865355beef1b9cbb
* | Solved compilation problemmarha2013-10-251-1/+1
| |
* | Synchronised opengl filesmarha2013-10-246-17/+28
| |
* | Merge remote-tracking branch 'origin/released'marha2013-10-2419-150/+210
|\| | | | | | | | | | | | | | | * origin/released: fontconfig mesa xserver git update 24 oct 2013 Conflicts: xorg-server/glx/glxdricommon.c
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 12:00:59 +0000