aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-10-3118-116/+80
|\ | | | | | | | | * origin/released: mesa git update 31 oct 2012
| * mesa git update 31 oct 2012marha2012-10-3118-116/+80
| | | | | | | | mesa: 183e122bdfe27f875c3c121964484dae9587c051
* | Solved problem of dxtn.dll not loaded anymoremarha2012-10-311-3/+3
| |
* | Now create a seperate installer for the debug exe and dllsmarha2012-10-301-4/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2012-10-3016-167/+109
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-3016-167/+109
| | | | | | | | | | | | fontconfig: bdaef0b80dc27f4ab7a9d9bcedcfd8b5724b3cfd xserver: 1ca096d5e07221025c4c4110528772b7d94f15ee mesa: 0a66ced8f822b0d5478b0cd6d72c1a6ad70647a2
* | Merge remote-tracking branch 'origin/released'marha2012-10-261-0/+2
|\| | | | | | | | | * origin/released: fontconfig pixman mesa git update 26 oct 2012
| * fontconfig pixman mesa git update 26 oct 2012marha2012-10-261-0/+2
| | | | | | | | | | | | fontconfig: 038aa930ae2c3b7972eefe334917e7222fe478ec mesa: 8fb4b1dce156d02a0907925364d8945915c29bcf pixman: 4b91f6ca72db3e8cbd7e97e9ef44be2f8994040d
* | Merge remote-tracking branch 'origin/released'marha2012-10-2515-168/+233
|\| | | | | | | | | * origin/released: fontconfig mesa pixman git update
| * fontconfig mesa pixman git updatemarha2012-10-2515-168/+233
| | | | | | | | | | | | fonconfig: 73ab254336100c5971e3a1e14b73222efd0e9822 mesa: 86cd77d0a9ac940c2c06eebc5e9ef840d176712a pixman: 9df645dfb04b5a790faabe1e9a84fc37287d91b0
* | Merge remote-tracking branch 'origin/released'marha2012-10-227-527/+11
|\| | | | | | | | | * origin/released: libX11 mesa pixman git update 22 oct 2012
| * libX11 mesa pixman git update 22 oct 2012marha2012-10-227-527/+11
| | | | | | | | | | | | libX11: f2a8def423a46d52e834cf7ea49fa0079427663a mesa: 259fc154f1fdcabbc0a6c02c524962b063f9dee6 pixman: 31e5a0a393defb8e0534ab1bde29ab23fc04795d
* | Merge remote-tracking branch 'origin/released'marha2012-10-1799-5955/+241
|\| | | | | | | | | * origin/released: pixman mesa git update 17 oct 2012
| * pixman mesa git update 17 oct 2012marha2012-10-1799-5955/+241
| | | | | | | | | | pixman: 6e56098c0338ce74228187e4c96fed1a66cb0956 mesa: 0199ff7fe323cf527ffacfdef3258ab85799dd13
* | Merge remote-tracking branch 'origin/released'marha2012-10-159-167/+93
|\| | | | | | | | | | | | | | | * 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-159-167/+93
| | | | | | | | | | | | xserver: a69429a17bf4630f6e26f61630a1c2b287202627 pixman: d5f2f39319fc358cccda60abe0bc927bd27131c1 mesa: 4004620d34a580c8fdb965d9b640e97453fc8b28
* | Merge remote-tracking branch 'origin/released'marha2012-10-1111-1037/+1053
|\| | | | | | | | | | | | | | | | | | | | | | | * 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-1111-1037/+1053
| | | | | | | | | | xwininfo: f7b55bdf674fc790e879a2e25ef83925dd8379d6 mesa: 34c58acb59bc0b827e28ef9e89044621ab0b3ee1
* | Merge remote-tracking branch 'origin/released'marha2012-10-103-22/+0
|\| | | | | | | | | * origin/released: xserver mesa git update 10 oct 2012
| * xserver mesa git update 10 oct 2012marha2012-10-103-22/+0
| | | | | | | | | | xserver: 4b7f00346daed20c96f3e8ea13ae411858a5424b mesa: 87a34131c427b40a561cfef1513b446a0eeabc39
* | Merge remote-tracking branch 'origin/released'marha2012-10-093-10/+4
|\| | | | | | | | | * origin/released: fontconfig xserver mesa xkeyboard-config git update 9 oct 2012
| * fontconfig xserver mesa xkeyboard-config git update 9 oct 2012marha2012-10-093-10/+4
| | | | | | | | | | | | | | fontconfig: e7bfe729ab4cae63ca502291c1fe46cf7152b459 mesa: 63c3a799aecff5348ecec3c4c13355996e4bf820 xserver: 0a75bd640b3dc26b89d9e342999a7f4b7e98edbf xkeyboard-config: 2e9ab8be72b1d0306e5e6e8c33cde51c0c927450
* | Merge remote-tracking branch 'origin/released'marha2012-10-0811-82/+60
|\| | | | | | | | | | | | | | | | | | | | | * 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-0811-82/+60
| | | | | | | | | | | | | | | | xserver: 09f1e5b15b769e1122f0a8d7cae0820038992312 libxcb: 4ffe54f69049e6792a35a287fd9ff83abbd4fd8d mesa: 86de501f14f11f1e993c8703c0d69bdf1f6c7835 xkeyboard-config: 0a21bb5a28018902a6252fccb620d7dff7e67175 pixman: 3d81d89c292058522cce91338028d9b4c4a23c24
* | Merge remote-tracking branch 'origin/released'marha2012-10-0412-41/+53
|\| | | | | | | | | * origin/released: randrproto mesa pixman git update 4 oct 2012
| * randrproto mesa pixman git update 4 oct 2012marha2012-10-0412-41/+53
| | | | | | | | | | | | randrproto: 4fcbd8584e55ff789522a38a41a33c34446d1455 mesa: 185d6df3c10a7ff5defe163af614bfc41088910b pixman: 2e17b6dd4ee7c32684fb7ffc70d3ad3ebf7cb2ef
* | Merge remote-tracking branch 'origin/released'marha2012-10-0122-612/+676
|\| | | | | | | | | | | | | | | * 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-0122-612/+676
| | | | | | | | | | | | | | libxcb: 23911a707b8845bff52cd7853fc5d59fb0823cef mesa: c321b1bef15e2807de3f6225c4abcbf48969997a pixman: 183afcf1d95625a1f237ef349a1c8931d94d000d xkeyboard-config: 159e8db2a3829a11801d06cc6cad6d1378551dd5
* | Merge remote-tracking branch 'origin/released'marha2012-09-2715-506/+423
|\| | | | | | | | | * origin/released: mesa xserver pixman xkeyboard-config git update 27 sep 2012
| * mesa xserver pixman xkeyboard-config git update 27 sep 2012marha2012-09-2715-506/+423
| | | | | | | | | | | | | | xserver 0b02150c27e98f996e10d7489f9f67a30e4e3497 pixman aff796d6cee4cb81f0352c2f7d0c994229bd5ca1 xkeyboard-config 33ccc8f4b3f1c6ae95242cf9cb19e8df87f6f37e mesa 6d6aef79742ece3bb570ae44e6c13791aae15e01
* | Merge remote-tracking branch 'origin/released'marha2012-09-245-63/+103
|\| | | | | | | | | | | | | | | | | * 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-245-63/+103
| | | | | | | | | | | | xserver: 7722bcbab2507d263c7685b15cccbfdd52fc3a24 pixman: c4b69e706e63e01fbc70e0026c2079007c89de14 mesa: c432c86e6aeebeb46c028af940224c59faa16e88
* | Merge remote-tracking branch 'origin/released'marha2012-09-202-2/+17
|\| | | | | | | | | | | | | | | * origin/released: libxcb xserver pixman mesa git update 20 sep 2012 Conflicts: libxcb/src/xcb_conn.c
| * libxcb xserver pixman mesa git update 20 sep 2012marha2012-09-202-2/+17
| | | | | | | | | | | | | | libxcb: 08cc068ead7b8e678cdb119b38ada5261d5cc3ea xserver: 70e5766874a919039678bb2ed75f2ccea0cb4345 pixman: 3124a51abb89475b8c5045bc96e04c5852694a16 mesa: bd8fb9e80562fbe0ff76cae50fc411635096f3a9
* | Added -p option to bison command lines to avoid link problemsmarha2012-09-181-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2012-09-1811-372/+402
|\|
| * mesa git update 18 sep 2012marha2012-09-1811-372/+402
| |
* | Merge remote-tracking branch 'origin/released'marha2012-09-17121-1669/+193
|\| | | | | | | | | | | Conflicts: mesalib/src/mesa/main/syncobj.h pixman/pixman/pixman-mmx.c
| * mesa xserver pixman git update 17 sep 2012marha2012-09-17121-1669/+193
| |
* | Merge remote-tracking branch 'origin/released'marha2012-09-148-80/+160
|\|
| * fontconfig libX11 mesa xkeyboard-config git update 14 sep 2012marha2012-09-148-80/+160
| |
* | Merge remote-tracking branch 'origin/released'marha2012-09-0672-332/+272
|\|
| * xserver mesa git update 6 sep 2012marha2012-09-0672-332/+272
| |
* | Merge remote-tracking branch 'origin/released'marha2012-09-051-1/+1
|\| | | | | | | | | Conflicts: xorg-server/dix/dispatch.c
| * xserver mesa git update 4 sep 2012marha2012-09-051-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2012-09-0413-91/+65
|\| | | | | | | | | | | | | | | | | | | Conflicts: libxcb/src/xcb_ext.c libxcb/src/xcb_xid.c mesalib/src/mesa/main/.gitignore mesalib/src/mesa/main/eval.c mesalib/src/mesa/main/imports.h mesalib/src/mesa/main/macros.h
| * mesa git update 4 sep 2012marha2012-09-0413-91/+65
| |
| * mesa xkeyboard-config git update 3 sep 2012marha2012-09-0338-241/+222
| |
| * randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xservermarha2012-08-3147-1961/+1703
| | | | | | | | git update 31 Aug 2012
| * fontconfig mesa xserver git update 28 Aug 2012marha2012-08-281-0/+10
| |