aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-11-07214-7979/+10439
|\ | | | | | | | | | | | | | | | | | | | | | | * origin/released: xserver mesa xkbcomp git update 7 nov 2012 Conflicts: mesalib/src/mapi/glapi/gen/glX_API.xml mesalib/src/mesa/main/.gitignore xkbcomp/listing.c xorg-server/hw/xwin/winshaddd.c xorg-server/hw/xwin/winshadddnl.c
| * xserver mesa xkbcomp git update 7 nov 2012marha2012-11-07180-6499/+6714
| | | | | | | | | | | | xserver: 011f8458805e443ac9130865d2840a929a00cabf xkbcomp: bd1103ef3cfef9cfed645566f944a69e7ca568b4 mesa: f42518962a08ce927e4ddd233d19d2661e135834
* | Merge remote-tracking branch 'origin/released'marha2012-11-0778-8410/+5822
|\| | | | | | | | | | | | | | | | | | | | | | | | | * origin/released: xserver mesa xkbcomp git update 5 nov 2012 Conflicts: mesalib/src/glsl/.gitignore mesalib/src/mesa/main/.gitignore xorg-server/Xi/chgdctl.c xorg-server/dix/getevents.c xorg-server/hw/xwin/winprefs.c xorg-server/os/utils.c
| * xserver mesa xkbcomp git update 5 nov 2012marha2012-11-0568-4550/+1079
| | | | | | | | | | | | xserver: a194630f7f7b287cb4ea4a459df0745f4c0d4c1a mesa: ccbfe3dde94cd50a4e6468cfeabf95c79c9d8072 xkbcomp: a68c5b7b29eb1433b1be73b50c4248e10eab8e64
* | Solved problem of mesa dll not being build anymore.marha2012-10-311-2/+5
| | | | | | | | File name checking is case sensitive in mhmake
* | Merge remote-tracking branch 'origin/released'marha2012-10-3135-283/+427
|\| | | | | | | | | * origin/released: mesa git update 31 oct 2012
| * mesa git update 31 oct 2012marha2012-10-3135-283/+427
| | | | | | | | mesa: 183e122bdfe27f875c3c121964484dae9587c051
* | Added ignoremarha2012-10-311-0/+1
| |
* | Solved problem of dxtn.dll not loaded anymoremarha2012-10-311-3/+3
| |
* | Converted error message which wasn't realy an error message to a warningmarha2012-10-312-3/+7
| | | | | | | | Also print the symbol name in the warning message
* | Now create a seperate installer for the debug exe and dllsmarha2012-10-3010-161/+128
| |
* | Merge remote-tracking branch 'origin/released'marha2012-10-3061-825/+859
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/released: fontconfig xserver mesa git update 30 oct 2012 Conflicts: xorg-server/dix/grabs.c xorg-server/hw/xwin/winclipboard.h xorg-server/hw/xwin/winclipboardthread.c xorg-server/hw/xwin/winclipboardwrappers.c xorg-server/hw/xwin/winmonitors.c xorg-server/hw/xwin/winmsg.c xorg-server/hw/xwin/winmsg.h xorg-server/hw/xwin/winprefslex.l xorg-server/hw/xwin/winprefsyacc.y xorg-server/hw/xwin/winregistry.c
| * fontconfig xserver mesa git update 30 oct 2012marha2012-10-3061-830/+878
| | | | | | | | | | | | fontconfig: bdaef0b80dc27f4ab7a9d9bcedcfd8b5724b3cfd xserver: 1ca096d5e07221025c4c4110528772b7d94f15ee mesa: 0a66ced8f822b0d5478b0cd6d72c1a6ad70647a2
* | Merge remote-tracking branch 'origin/released'marha2012-10-2622-55/+764
|\| | | | | | | | | * origin/released: fontconfig pixman mesa git update 26 oct 2012
| * fontconfig pixman mesa git update 26 oct 2012marha2012-10-2622-55/+764
| | | | | | | | | | | | fontconfig: 038aa930ae2c3b7972eefe334917e7222fe478ec mesa: 8fb4b1dce156d02a0907925364d8945915c29bcf pixman: 4b91f6ca72db3e8cbd7e97e9ef44be2f8994040d
* | Merge remote-tracking branch 'origin/released'marha2012-10-2525-177/+553
|\| | | | | | | | | * origin/released: fontconfig mesa pixman git update
| * fontconfig mesa pixman git updatemarha2012-10-2525-177/+553
| | | | | | | | | | | | fonconfig: 73ab254336100c5971e3a1e14b73222efd0e9822 mesa: 86cd77d0a9ac940c2c06eebc5e9ef840d176712a pixman: 9df645dfb04b5a790faabe1e9a84fc37287d91b0
* | Increased version number to 1.13.0.01.13.0.0marha2012-10-224-3/+903
| | | | | | | | Added release not for 1.13.0.0
* | Merge remote-tracking branch 'origin/released'marha2012-10-2221-1626/+1199
|\| | | | | | | | | * origin/released: libX11 mesa pixman git update 22 oct 2012
| * libX11 mesa pixman git update 22 oct 2012marha2012-10-2221-1626/+1199
| | | | | | | | | | | | libX11: f2a8def423a46d52e834cf7ea49fa0079427663a mesa: 259fc154f1fdcabbc0a6c02c524962b063f9dee6 pixman: 31e5a0a393defb8e0534ab1bde29ab23fc04795d
* | Adjusted path to pythonmarha2012-10-171-244/+244
| |
* | Removed deleted files from projectmarha2012-10-172-16/+4
| |
* | Merge remote-tracking branch 'origin/released'marha2012-10-17136-6929/+2142
|\| | | | | | | | | * origin/released: pixman mesa git update 17 oct 2012
| * pixman mesa git update 17 oct 2012marha2012-10-17136-6929/+2142
| | | | | | | | | | pixman: 6e56098c0338ce74228187e4c96fed1a66cb0956 mesa: 0199ff7fe323cf527ffacfdef3258ab85799dd13
* | Merge remote-tracking branch 'origin/released'marha2012-10-1534-561/+372
|\| | | | | | | | | | | | | | | * origin/released: xserver mesa pixman git update 15 oct 2012 Conflicts: xorg-server/hw/xwin/InitOutput.c
| * xserver mesa pixman git update 15 oct 2012marha2012-10-1535-563/+375
| | | | | | | | | | | | xserver: a69429a17bf4630f6e26f61630a1c2b287202627 pixman: d5f2f39319fc358cccda60abe0bc927bd27131c1 mesa: 4004620d34a580c8fdb965d9b640e97453fc8b28
* | Added generation of get_hash.h header filemarha2012-10-111-3/+10
| |
* | Solved problems introduced in mergemarha2012-10-114-29/+29
| |
* | Merge remote-tracking branch 'origin/released'marha2012-10-1134-6684/+6701
|\| | | | | | | | | | | | | | | | | | | | | | | * origin/released: xwininfo mesa git update 11 oct 2012 Conflicts: mesalib/src/mapi/glapi/gen/glX_proto_recv.py mesalib/src/mapi/glapi/gen/glX_proto_size.py mesalib/src/mapi/glapi/gen/glX_server_table.py mesalib/src/mapi/glapi/gen/gl_table.py mesalib/src/mesa/main/.gitignore
| * xwininfo mesa git update 11 oct 2012marha2012-10-1134-6737/+6754
| | | | | | | | | | xwininfo: f7b55bdf674fc790e879a2e25ef83925dd8379d6 mesa: 34c58acb59bc0b827e28ef9e89044621ab0b3ee1
* | Merge remote-tracking branch 'origin/released'marha2012-10-1010-99/+57
|\| | | | | | | | | * origin/released: xserver mesa git update 10 oct 2012
| * xserver mesa git update 10 oct 2012marha2012-10-1010-99/+57
| | | | | | | | | | xserver: 4b7f00346daed20c96f3e8ea13ae411858a5424b mesa: 87a34131c427b40a561cfef1513b446a0eeabc39
* | Merge remote-tracking branch 'origin/released'marha2012-10-099-19/+35
|\| | | | | | | | | * origin/released: fontconfig xserver mesa xkeyboard-config git update 9 oct 2012
| * fontconfig xserver mesa xkeyboard-config git update 9 oct 2012marha2012-10-099-19/+35
| | | | | | | | | | | | | | fontconfig: e7bfe729ab4cae63ca502291c1fe46cf7152b459 mesa: 63c3a799aecff5348ecec3c4c13355996e4bf820 xserver: 0a75bd640b3dc26b89d9e342999a7f4b7e98edbf xkeyboard-config: 2e9ab8be72b1d0306e5e6e8c33cde51c0c927450
* | Synchronisedmarha2012-10-081-1/+1
| |
* | Synchronised with Makefile.sourcesmarha2012-10-081-22/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2012-10-0879-1667/+3085
|\| | | | | | | | | | | | | | | | | | | | | * origin/released: pixman libxcb mesa xserver xkeyboard-config git update 8 oct 2012 Conflicts: xorg-server/Xext/xf86bigfont.c xorg-server/dix/dispatch.c xorg-server/include/dixstruct.h xorg-server/os/connection.c
| * pixman libxcb mesa xserver xkeyboard-config git update 8 oct 2012marha2012-10-0879-1667/+3083
| | | | | | | | | | | | | | | | xserver: 09f1e5b15b769e1122f0a8d7cae0820038992312 libxcb: 4ffe54f69049e6792a35a287fd9ff83abbd4fd8d mesa: 86de501f14f11f1e993c8703c0d69bdf1f6c7835 xkeyboard-config: 0a21bb5a28018902a6252fccb620d7dff7e67175 pixman: 3d81d89c292058522cce91338028d9b4c4a23c24
* | Merge remote-tracking branch 'origin/released'marha2012-10-0438-201/+282
|\| | | | | | | | | * origin/released: randrproto mesa pixman git update 4 oct 2012
| * randrproto mesa pixman git update 4 oct 2012marha2012-10-0438-201/+282
| | | | | | | | | | | | randrproto: 4fcbd8584e55ff789522a38a41a33c34446d1455 mesa: 185d6df3c10a7ff5defe163af614bfc41088910b pixman: 2e17b6dd4ee7c32684fb7ffc70d3ad3ebf7cb2ef
* | Make sure that version info is print to log filemarha2012-10-021-8/+6
| |
* | Solved problem of finding valid open socket in case ipv6 is not installedmarha2012-10-021-1/+1
| | | | | | | | and display number -1 is passed.
* | Merge remote-tracking branch 'origin/released'marha2012-10-0144-867/+1795
|\| | | | | | | | | | | | | | | * origin/released: libxcb mesa pixman xkeyboard-config git update 1 oct 2012 Conflicts: libxcb/src/man/.gitignore
| * libxcb mesa pixman xkeyboard-config git update 1 oct 2012marha2012-10-0144-866/+1795
| | | | | | | | | | | | | | libxcb: 23911a707b8845bff52cd7853fc5d59fb0823cef mesa: c321b1bef15e2807de3f6225c4abcbf48969997a pixman: 183afcf1d95625a1f237ef349a1c8931d94d000d xkeyboard-config: 159e8db2a3829a11801d06cc6cad6d1378551dd5
* | synchronised filemarha2012-09-271-177/+117
| |
* | Merge remote-tracking branch 'origin/released'marha2012-09-2746-22318/+23172
|\| | | | | | | | | * origin/released: mesa xserver pixman xkeyboard-config git update 27 sep 2012
| * mesa xserver pixman xkeyboard-config git update 27 sep 2012marha2012-09-2746-22318/+23172
| | | | | | | | | | | | | | xserver 0b02150c27e98f996e10d7489f9f67a30e4e3497 pixman aff796d6cee4cb81f0352c2f7d0c994229bd5ca1 xkeyboard-config 33ccc8f4b3f1c6ae95242cf9cb19e8df87f6f37e mesa 6d6aef79742ece3bb570ae44e6c13791aae15e01
* | Only add glx extension onemarha2012-09-241-2/+3
| |
* | Merge remote-tracking branch 'origin/released'marha2012-09-2460-1471/+894
|\| | | | | | | | | | | | | | | | | * origin/released: mesa pixman xserver git update 24 sep 2012 Conflicts: pixman/pixman/pixman-sse2.c xorg-server/dix/window.c
| * mesa pixman xserver git update 24 sep 2012marha2012-09-2460-1472/+895
| | | | | | | | | | | | xserver: 7722bcbab2507d263c7685b15cccbfdd52fc3a24 pixman: c4b69e706e63e01fbc70e0026c2079007c89de14 mesa: c432c86e6aeebeb46c028af940224c59faa16e88