Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2012-10-11 | 34 | -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 2012 | marha | 2012-10-11 | 34 | -6737/+6754 |
| | | | | | | | | | | xwininfo: f7b55bdf674fc790e879a2e25ef83925dd8379d6 mesa: 34c58acb59bc0b827e28ef9e89044621ab0b3ee1 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-10-10 | 10 | -99/+57 |
|\| | | | | | | | | | * origin/released: xserver mesa git update 10 oct 2012 | ||||
| * | xserver mesa git update 10 oct 2012 | marha | 2012-10-10 | 10 | -99/+57 |
| | | | | | | | | | | xserver: 4b7f00346daed20c96f3e8ea13ae411858a5424b mesa: 87a34131c427b40a561cfef1513b446a0eeabc39 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-10-09 | 9 | -19/+35 |
|\| | | | | | | | | | * origin/released: fontconfig xserver mesa xkeyboard-config git update 9 oct 2012 | ||||
| * | fontconfig xserver mesa xkeyboard-config git update 9 oct 2012 | marha | 2012-10-09 | 9 | -19/+35 |
| | | | | | | | | | | | | | | fontconfig: e7bfe729ab4cae63ca502291c1fe46cf7152b459 mesa: 63c3a799aecff5348ecec3c4c13355996e4bf820 xserver: 0a75bd640b3dc26b89d9e342999a7f4b7e98edbf xkeyboard-config: 2e9ab8be72b1d0306e5e6e8c33cde51c0c927450 | ||||
* | | Synchronised | marha | 2012-10-08 | 1 | -1/+1 |
| | | |||||
* | | Synchronised with Makefile.sources | marha | 2012-10-08 | 1 | -22/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-10-08 | 79 | -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 2012 | marha | 2012-10-08 | 79 | -1667/+3083 |
| | | | | | | | | | | | | | | | | xserver: 09f1e5b15b769e1122f0a8d7cae0820038992312 libxcb: 4ffe54f69049e6792a35a287fd9ff83abbd4fd8d mesa: 86de501f14f11f1e993c8703c0d69bdf1f6c7835 xkeyboard-config: 0a21bb5a28018902a6252fccb620d7dff7e67175 pixman: 3d81d89c292058522cce91338028d9b4c4a23c24 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-10-04 | 38 | -201/+282 |
|\| | | | | | | | | | * origin/released: randrproto mesa pixman git update 4 oct 2012 | ||||
| * | randrproto mesa pixman git update 4 oct 2012 | marha | 2012-10-04 | 38 | -201/+282 |
| | | | | | | | | | | | | randrproto: 4fcbd8584e55ff789522a38a41a33c34446d1455 mesa: 185d6df3c10a7ff5defe163af614bfc41088910b pixman: 2e17b6dd4ee7c32684fb7ffc70d3ad3ebf7cb2ef | ||||
* | | Make sure that version info is print to log file | marha | 2012-10-02 | 1 | -8/+6 |
| | | |||||
* | | Solved problem of finding valid open socket in case ipv6 is not installed | marha | 2012-10-02 | 1 | -1/+1 |
| | | | | | | | | and display number -1 is passed. | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-10-01 | 44 | -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 2012 | marha | 2012-10-01 | 44 | -866/+1795 |
| | | | | | | | | | | | | | | libxcb: 23911a707b8845bff52cd7853fc5d59fb0823cef mesa: c321b1bef15e2807de3f6225c4abcbf48969997a pixman: 183afcf1d95625a1f237ef349a1c8931d94d000d xkeyboard-config: 159e8db2a3829a11801d06cc6cad6d1378551dd5 | ||||
* | | synchronised file | marha | 2012-09-27 | 1 | -177/+117 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-09-27 | 46 | -22318/+23172 |
|\| | | | | | | | | | * origin/released: mesa xserver pixman xkeyboard-config git update 27 sep 2012 | ||||
| * | mesa xserver pixman xkeyboard-config git update 27 sep 2012 | marha | 2012-09-27 | 46 | -22318/+23172 |
| | | | | | | | | | | | | | | xserver 0b02150c27e98f996e10d7489f9f67a30e4e3497 pixman aff796d6cee4cb81f0352c2f7d0c994229bd5ca1 xkeyboard-config 33ccc8f4b3f1c6ae95242cf9cb19e8df87f6f37e mesa 6d6aef79742ece3bb570ae44e6c13791aae15e01 | ||||
* | | Only add glx extension one | marha | 2012-09-24 | 1 | -2/+3 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-09-24 | 60 | -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 2012 | marha | 2012-09-24 | 60 | -1472/+895 |
| | | | | | | | | | | | | xserver: 7722bcbab2507d263c7685b15cccbfdd52fc3a24 pixman: c4b69e706e63e01fbc70e0026c2079007c89de14 mesa: c432c86e6aeebeb46c028af940224c59faa16e88 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-09-20 | 106 | -1803/+2469 |
|\| | | | | | | | | | | | | | | | * 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 2012 | marha | 2012-09-20 | 106 | -1803/+2469 |
| | | | | | | | | | | | | | | libxcb: 08cc068ead7b8e678cdb119b38ada5261d5cc3ea xserver: 70e5766874a919039678bb2ed75f2ccea0cb4345 pixman: 3124a51abb89475b8c5045bc96e04c5852694a16 mesa: bd8fb9e80562fbe0ff76cae50fc411635096f3a9 | ||||
* | | Added -p option to bison command lines to avoid link problems | marha | 2012-09-18 | 2 | -2/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-09-18 | 15 | -3971/+403 |
|\| | |||||
| * | mesa git update 18 sep 2012 | marha | 2012-09-18 | 15 | -3971/+403 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-09-17 | 138 | -1750/+289 |
|\| | | | | | | | | | | | Conflicts: mesalib/src/mesa/main/syncobj.h pixman/pixman/pixman-mmx.c | ||||
| * | mesa xserver pixman git update 17 sep 2012 | marha | 2012-09-17 | 138 | -1759/+300 |
| | | |||||
* | | Updated makefile because of the addition of sharp_vndr in symbols | marha | 2012-09-14 | 2 | -2/+18 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-09-14 | 27 | -103/+623 |
|\| | |||||
| * | fontconfig libX11 mesa xkeyboard-config git update 14 sep 2012 | marha | 2012-09-14 | 27 | -103/+623 |
| | | |||||
* | | synchronised dix-config.h with dix-config.h.in | marha | 2012-09-06 | 1 | -0/+9 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-09-06 | 88 | -363/+314 |
|\| | |||||
| * | xserver mesa git update 6 sep 2012 | marha | 2012-09-06 | 88 | -363/+314 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-09-06 | 1 | -0/+23 |
|\| | |||||
| * | Added script to fast forward a tracking branch that is not checked out | marha | 2012-09-05 | 1 | -0/+23 |
| | | |||||
* | | Instead of giving a fatal error just remove the env variables that are too | marha | 2012-09-05 | 1 | -2/+0 |
| | | | | | | | | long | ||||
* | | Initialize the log file a little bit earlier in the startup process | marha | 2012-09-05 | 2 | -7/+13 |
| | | |||||
* | | Changed fatal error a little | marha | 2012-09-05 | 1 | -5/+5 |
| | | |||||
* | | Help message may be printed in log file | marha | 2012-09-05 | 1 | -2/+2 |
| | | |||||
* | | Removed printing milli-seconds in log file | marha | 2012-09-05 | 1 | -2/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-09-05 | 6 | -5/+24 |
|\| | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c | ||||
| * | xserver mesa git update 4 sep 2012 | marha | 2012-09-05 | 6 | -5/+24 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-09-04 | 15 | -93/+73 |
|\| | | | | | | | | | | | | | | | | | | | 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 2012 | marha | 2012-09-04 | 15 | -93/+73 |
| | | |||||
| * | mesa xkeyboard-config git update 3 sep 2012 | marha | 2012-09-03 | 262 | -58612/+326 |
| | | |||||
| * | randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xserver | marha | 2012-08-31 | 86 | -2441/+2395 |
| | | | | | | | | git update 31 Aug 2012 | ||||
| * | fontconfig mesa xserver git update 28 Aug 2012 | marha | 2012-08-28 | 14 | -39/+394 |
| | | |||||
| * | xwininfo fontconfig libX11 libXau libXext libxcb mesa pixman | marha | 2012-08-27 | 254 | -49973/+38220 |
| | | | | | | | | xkeyboard-config git update 27 Aug 2012 |