aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'origin/released'marha2013-08-19156-634/+3589
|\| | | | | | | | | | | | | | | * origin/released: fontconfig libX11 libXdmcp libxcb xkeyboard-config mesa pixman xserver git update 19 aug 2013 Conflicts: fontconfig/src/fccache.c
| * fontconfig libX11 libXdmcp libxcb xkeyboard-config mesa pixman xserver git ↵marha2013-08-19156-634/+3589
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update 19 aug 2013 xserver commit fe7463b8ce0de301c2f82b108c93963424f77219 libxcb commit 5648ddd2b97068f549268284129a438a6845e14c libxcb/xcb-proto commit 56a82005ac388fcb7a4d1c82e07c7e72eaf69a32 xkeyboard-config commit 87c865aee1844b2cc6b1a5a208116dd095f4d76a libX11 commit 9b291044a240e5b9b031ed814e0c84e53a1c3084 libXdmcp commit 66514a4af7eaa47e8718434356d7efce95e570cf libXext commit 7378d4bdbd33ed49ed6cfa5c4f73d7527982aab4 libfontenc commit 3acba630d8b57084f7e92c15732408711ed5137a libXinerama commit 6e1d1dc328ba8162bba2f4694e7f3c706a1491ff libXau commit 899790011304c4029e15abf410e49ce7cec17e0a xkbcomp commit 0ebdf47fd4bc434ac3d2339544c022a869510738 pixman commit 3518a0dafa63098d41e466f73d105b7e3e4b12de xextproto commit f27fcc99d1cf935cc289933326f7d3baacd5107a randrproto commit ca7cc541c2e43e6c784df19b4583ac35829d2f72 glproto commit 8e3407e02980d088e20041e79bdcdd3737e7827e mkfontscale commit f48de13423c7300f4da9f61993b624426b38ddc0 xwininfo commit ba0d1b0da21d2dbdd81098ed5778f3792b472e13 libXft commit c5e760a239afc62a1c75e0509868e35957c8df52 libXmu commit d5dac08d65c4865f311cb62c161dbb1300eecd11 libxtrans commit f6a161f2a003f4da0a2e414b4faa0ee0de0c01f0 fontconfig commit 084cf7c44e985dd48c088d921ad0d9a43b0b00b4 mesa commit d13003f544417db6de44c65a0c118bd2b189458a
* | Merge remote-tracking branch 'origin/released'marha2013-08-0155-431/+787
|\| | | | | | | | | * origin/released: libX11 mesa xserver xkeyboard-config git update 1 aug 2013
| * libX11 mesa xserver xkeyboard-config git update 1 aug 2013marha2013-08-0155-431/+787
| | | | | | | | | | | | | | xserver commit b6e5c4669e0db391966deb397e8c975ec7f0124d xkeyboard-config commit abaf14335dc6504e59d91e77babc8e034df5beb7 libX11 commit 44f84223f5e2dd46883fcbd352af2798bfa9aeb6 mesa commit 3eef7fec677f40eef1674e44e7ebd836bc7f8612
* | Solved compile errormarha2013-08-011-0/+4
| |
* | Merge remote-tracking branch 'origin/released'marha2013-07-2922-226/+222
|\| | | | | | | | | * origin/released: libX11 mesa xserver git update 29 July 2013
| * libX11 mesa xserver git update 29 July 2013marha2013-07-2922-226/+222
| | | | | | | | | | | | xserver commit ff38bbe81ace85bf675bbaa0a9ca5f3b32ede449 libX11 commit 208e586c808e88a2ee819e4450dc27f557afc2bf mesa commit e847b5ae066bf9a209dad482fcc664f944983633
* | Solved runtime problems when compiled for 64-bit1.14.2.1marha2013-07-265-2927/+2927
| |
* | Solved typing mistakemarha2013-07-261-1/+1
| |
* | Added libxml2 64-bit binariesmarha2013-07-264-0/+0
| |
* | Version increased to 1.14.2.1marha2013-07-268-14/+1022
| |
* | Merge remote-tracking branch 'origin/released'marha2013-07-267-17/+27
|\| | | | | | | | | * origin/released: xserver mesa git update 26 Jul 2013
| * xserver mesa git update 26 Jul 2013marha2013-07-267-17/+27
| | | | | | | | | | xserver commit bdd1e22cbde9ea2324e4e1991c9e152f22f88151 mesa commit 81a156d099b5c224d4a528b66a80e25626ed65bc
* | Solved compilation problems due to latest mergemarha2013-07-255-2/+16
| |
* | Merge remote-tracking branch 'origin/released'marha2013-07-2541-250/+635
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/released: xserver mesa git update 25 Jul 2013 Conflicts: xorg-server/hw/xwin/win.h xorg-server/hw/xwin/winclipboardthread.c xorg-server/hw/xwin/winglobals.c xorg-server/hw/xwin/winmouse.c xorg-server/hw/xwin/winmultiwindowclass.c xorg-server/hw/xwin/winscrinit.c xorg-server/hw/xwin/winwin32rootless.c xorg-server/hw/xwin/winwin32rootlesswndproc.c xorg-server/hw/xwin/winwindow.h xorg-server/hw/xwin/winwindowswm.c xorg-server/hw/xwin/winwndproc.c
| * xserver mesa git update 25 Jul 2013marha2013-07-2533-197/+589
| | | | | | | | | | xserver commit 43ac0491e36cdbb716b5c9d39c97d0aba3bebd75 mesa commit 8a9df7a370b66ec50b6255e4d66ac1ed331319fb
* | 64-bit compilation now compiles and runsmarha2013-07-25100-1770/+6189
| |
* | Removed da from makefilemarha2013-07-241-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2013-07-2325-101/+150
|\| | | | | | | | | * origin/released: libX11 libXmu mesa xserver git update 23 July 2013
| * libX11 libXmu mesa xserver git update 23 July 2013marha2013-07-2325-101/+150
| | | | | | | | | | | | | | xserver commit d5ebe20f9ba9569351c4a41449866679fd60ba45 libX11 commit feb131b18aee31c2c125dc3275b0260940245882 libXmu commit d5dac08d65c4865f311cb62c161dbb1300eecd11 mesa commit 5a7bdd4b4173958c53109517b7c95f1039623e7e
* | Merge remote-tracking branch 'origin/released'marha2013-07-227-6/+11
|\| | | | | | | | | * origin/released: libX11 mesa git update 22 Jul 2013
| * libX11 mesa git update 22 Jul 2013marha2013-07-227-6/+11
| | | | | | | | | | libX11 commit 24d3ee0d08f24e23c91d55702f010f73d7b908e5 mesa commit 190312949e8ce2c1dc884d4db5d6a44511666641
* | Synchronised filemarha2013-07-222-1445/+1448
| |
* | gen_gl_wrappers.py: now use the opengl xml files as inputmarha2013-07-2227-80020/+47021
| |
* | Synchronised filesmarha2013-07-198-17045/+17109
| |
* | Synchronised filemarha2013-07-191-0/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2013-07-1930-347/+977
|\| | | | | | | | | * origin/released: mesa xkbcomp git update 19 Jul 2013
| * mesa xkbcomp git update 19 Jul 2013marha2013-07-1930-347/+977
| | | | | | | | | | xkbcomp commit 0ebdf47fd4bc434ac3d2339544c022a869510738 esa commit 9f07ca11c1797ac12de1e1c6aef13cf58824b5f5
* | Synchronised filemarha2013-07-171-10573/+10573
| |
* | Merge remote-tracking branch 'origin/released'marha2013-07-1712-1717/+1731
|\| | | | | | | | | * origin/released: mesa mkfontscale xserver git update 17 Jul 2013
| * mesa mkfontscale xserver git update 17 Jul 2013marha2013-07-1712-1717/+1731
| | | | | | | | | | | | xserver commit 74469895e39fa38337f59edd64c4031ab9bb51d8 mkfontscale commit f48de13423c7300f4da9f61993b624426b38ddc0 mesa commit b20e0fb5204ea85904e9f72f583e65bf35b446cb
* | Synchronised filesmarha2013-07-163-17/+19
| |
* | Merge remote-tracking branch 'origin/released'marha2013-07-1635-878/+591
|\| | | | | | | | | | | | | | | * origin/released: libxcb xcb-proto mesa xkbcomp git update 16 Jul 2013 Conflicts: mesalib/src/glsl/glsl_symbol_table.cpp
| * libxcb xcb-proto mesa xkbcomp git update 16 Jul 2013marha2013-07-1635-878/+591
| | | | | | | | | | | | | | libxcb commit 45619dc71e9411a526d7c69595cf615b1b1206cf libxcb/xcb-proto commit 56a82005ac388fcb7a4d1c82e07c7e72eaf69a32 xkbcomp commit 1cd5c50c54b06de2238d6d7675d0a3c65a21414d mesa commit e4fdf1b008ce29c5b5a52985c586b61f35d31e4c
* | solved compilation problemmarha2013-07-161-2/+2
| |
* | Synchronised filemarha2013-07-121-28/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2013-07-1222-101/+733
|\| | | | | | | | | * origin/released: libxtrans fontconfig mesa xserver git update 12 Jul 2013
| * libxtrans fontconfig mesa xserver git update 12 Jul 2013marha2013-07-1222-101/+733
| | | | | | | | | | | | | | xserver commit 59a6d3f1eb03010ab831b32b03706a1d6143c732 libxtrans commit f6a161f2a003f4da0a2e414b4faa0ee0de0c01f0 fontconfig commit 338ffe6b886ad4ba86ff471cb59c4a5e5ffbe408 mesa commit 1b0d6aef03161eff4c9933548e964fec1258ea44
* | Merge remote-tracking branch 'origin/released'marha2013-07-097-48/+29
|\| | | | | | | | | * origin/released: fontconfig libX11 libxcb mesa git update 9 Jul 2013
| * fontconfig libX11 libxcb mesa git update 9 Jul 2013marha2013-07-098-49/+30
| | | | | | | | | | | | | | libxcb commit a1e67b141a57d39cbcaff1a703d6fc0da1fbb56d libX11 commit 383e2b0d029482a0f4c39fe00e15397538576fc1 fontconfig commit 04bd904632b22682c888f658650cdcd322544273 mesa commit 292368570a13501dfa95b1b0dd70966caf6ffc6b
* | Merge remote-tracking branch 'origin/released'marha2013-07-083-40/+1
|\| | | | | | | | | * origin/released: libX11 git update 8 Jul 2013
| * libX11 git update 8 Jul 2013marha2013-07-083-40/+1
| | | | | | | | libX11 commit a336db9a0add3ae0783dda6e52459236622a12af
* | Added missing files to mesa project filemarha2013-07-084-0/+8
| |
* | Merge remote-tracking branch 'origin/released'marha2013-07-0432-498/+1409
|\| | | | | | | | | * origin/released: fontconfig mesa libxcb git update 4 jul 2013
| * fontconfig mesa libxcb git update 4 jul 2013marha2013-07-0434-498/+1409
| | | | | | | | | | | | | | libxcb commit 8b6bb1a71977116d382f45eef803aedd3e313d37 libxcb/xcb-proto commit e6a246e50e62cbcba33d0e1d2371e69e6e089383 fontconfig commit d420e1df983871ab18b0f07976596fdf0ce78847 mesa commit bbd1e60198548a12be3405fc32dd39a87e8968ab
* | Solved mesa compilation problemsmarha2013-07-016-4/+10
| |
* | Merge remote-tracking branch 'origin/released'marha2013-07-0135-481/+99
|\| | | | | | | | | * origin/released: mesa git update 1 Jul 2013
| * mesa git update 1 Jul 2013marha2013-07-0135-481/+99
| | | | | | | | mesa commit bf95ca7de0c02a00a75d1d5e2693a33b68ff784d
* | Synchronised filesmarha2013-07-0120-24175/+25572
| |
* | Merge remote-tracking branch 'origin/released'marha2013-06-2897-11777/+9754
|\| | | | | | | | | | | * origin/released: fontconfig mesa git update 28 June 2013 libXext mesa git update 29 June 20013