| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Solved problems introduced in merge | marha | 2012-10-11 | 4 | -29/+29 |
| | | |||||
| * | Merge remote-tracking branch 'origin/released' | marha | 2012-10-11 | 22 | -5646/+5647 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | * 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 | 22 | -5699/+5700 |
| | | | | | | | | | | | xwininfo: f7b55bdf674fc790e879a2e25ef83925dd8379d6 mesa: 34c58acb59bc0b827e28ef9e89044621ab0b3ee1 | ||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-10-10 | 1 | -2/+0 |
| |\| | | | | | | | | | * origin/released: xserver mesa git update 10 oct 2012 | ||||
| | * | xserver mesa git update 10 oct 2012 | marha | 2012-10-10 | 1 | -2/+0 |
| | | | | | | | | | | | xserver: 4b7f00346daed20c96f3e8ea13ae411858a5424b mesa: 87a34131c427b40a561cfef1513b446a0eeabc39 | ||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-10-08 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | | | | | | | | | * 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 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | xserver: 09f1e5b15b769e1122f0a8d7cae0820038992312 libxcb: 4ffe54f69049e6792a35a287fd9ff83abbd4fd8d mesa: 86de501f14f11f1e993c8703c0d69bdf1f6c7835 xkeyboard-config: 0a21bb5a28018902a6252fccb620d7dff7e67175 pixman: 3d81d89c292058522cce91338028d9b4c4a23c24 | ||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-10-04 | 5 | -10/+16 |
| |\| | | | | | | | | | * origin/released: randrproto mesa pixman git update 4 oct 2012 | ||||
| | * | randrproto mesa pixman git update 4 oct 2012 | marha | 2012-10-04 | 5 | -10/+16 |
| | | | | | | | | | | | | | randrproto: 4fcbd8584e55ff789522a38a41a33c34446d1455 mesa: 185d6df3c10a7ff5defe163af614bfc41088910b pixman: 2e17b6dd4ee7c32684fb7ffc70d3ad3ebf7cb2ef | ||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-10-01 | 3 | -3/+3 |
| |\| | | | | | | | | | | | | | | | * 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 | 3 | -3/+3 |
| | | | | | | | | | | | | | | | libxcb: 23911a707b8845bff52cd7853fc5d59fb0823cef mesa: c321b1bef15e2807de3f6225c4abcbf48969997a pixman: 183afcf1d95625a1f237ef349a1c8931d94d000d xkeyboard-config: 159e8db2a3829a11801d06cc6cad6d1378551dd5 | ||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-09-14 | 1 | -2/+2 |
| |\| | |||||
| | * | fontconfig libX11 mesa xkeyboard-config git update 14 sep 2012 | marha | 2012-09-14 | 1 | -2/+2 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-09-06 | 5 | -7/+7 |
| |\| | |||||
| | * | xserver mesa git update 6 sep 2012 | marha | 2012-09-06 | 5 | -7/+7 |
| | | | |||||
| | * | randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xserver | marha | 2012-08-31 | 2 | -0/+31 |
| | | | | | | | | | git update 31 Aug 2012 | ||||
| | * | fontconfig mesa xserver git update 28 Aug 2012 | marha | 2012-08-28 | 1 | -10/+25 |
| | | | |||||
| | * | xwininfo fontconfig libX11 libXau libXext libxcb mesa pixman | marha | 2012-08-27 | 2 | -8/+12 |
| | | | | | | | | | xkeyboard-config git update 27 Aug 2012 | ||||
| * | | randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xserver | marha | 2012-09-04 | 2 | -0/+31 |
| | | | | | | | | | git update 31 Aug 2012 | ||||
| * | | fontconfig mesa xserver git update 28 Aug 2012 | marha | 2012-09-04 | 1 | -10/+25 |
| | | | |||||
| * | | xwininfo fontconfig libX11 libXau libXext libxcb mesa pixman | marha | 2012-09-04 | 2 | -8/+12 |
| | | | | | | | | | xkeyboard-config git update 27 Aug 2012 | ||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-08-16 | 5 | -8/+59 |
| |\| | |||||
| | * | libxcb xserver mesa git update 16 Aug 2012 | marha | 2012-08-16 | 5 | -8/+59 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-08-13 | 2 | -15/+31 |
| |\| | |||||
| | * | mesa pixman xkeyboard-config xserver git update 13 Aug 2012 | marha | 2012-08-13 | 2 | -15/+31 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-16 | 4 | -78/+70 |
| |\| | | | | | | | | | | | Conflicts: mesalib/src/glsl/.gitignore mesalib/src/glsl/glcpp/.gitignore | ||||
| | * | libX11 mesa git update 16 Jul 2012 | marha | 2012-07-16 | 4 | -78/+70 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-13 | 1 | -2/+48 |
| |\| | | | | | | | | | | | Conflicts: xorg-server/glx/glxext.c xorg-server/hw/xwin/InitOutput.c | ||||
| | * | xserver mesa git update 13 Jul 2012 | marha | 2012-07-13 | 1 | -2/+48 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-12 | 3 | -78/+102 |
| |\| | |||||
| | * | mesa xserver git update 12 Jul 2012 | marha | 2012-07-12 | 3 | -78/+102 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-11 | 1 | -1/+21 |
| |\| | | | | | | | | | Conflicts: xorg-server/dix/devices.c | ||||
| | * | mesa xserver pixman git update 11 Jul 2012 | marha | 2012-07-11 | 1 | -1/+21 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-06 | 2 | -10/+8 |
| |\| | | | | | | | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c xorg-server/dix/privates.c xorg-server/hw/kdrive/ephyr/ephyr.c xorg-server/hw/kdrive/src/kinput.c | ||||
| | * | randrproto fontconfig mesa xserver git update 6 Jul 2012 | marha | 2012-07-06 | 2 | -10/+8 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-04 | 1 | -23/+29 |
| |\| | | | | | | | | | | | Conflicts: xorg-server/include/misc.h xorg-server/os/utils.c | ||||
| | * | mesa xserver git update 4 Jul 2012 | marha | 2012-07-04 | 1 | -23/+29 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-28 | 5 | -6/+6 |
| |\| | |||||
| | * | xkeyboard-config mesa fontconfig randrproto git update 28 Jun 2012 | marha | 2012-06-28 | 5 | -6/+6 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-22 | 4 | -53/+152 |
| |\| | | | | | | | | | Conflicts: mesalib/src/mapi/glapi/gen/.gitignore | ||||
| | * | mesa xserver libxcb fontconfig | marha | 2012-06-22 | 4 | -31/+130 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-21 | 3 | -1/+43 |
| |\| | |||||
| | * | mesa pixman xkeyboard-config xserver git update 21 Jun 2012 | marha | 2012-06-21 | 3 | -1/+43 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-19 | 2 | -0/+9 |
| |\| | |||||
| | * | mesa git update 19 Juni 2012 | marha | 2012-06-19 | 2 | -0/+9 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-15 | 3 | -34/+226 |
| |\| | | | | | | | | | | | | | | | Conflicts: fontconfig/src/fcint.h fontconfig/src/fcstat.c mesalib/src/mapi/glapi/gen/GL3x.xml xorg-server/glx/glxext.h | ||||
| | * | fontconfig mesa pixman xserver git update 15 juni 2012 | marha | 2012-06-15 | 3 | -34/+226 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-12 | 1 | -1/+1 |
| |\| | |||||
| | * | fontconfig mesa pixman git update 12 Juni 2012 | marha | 2012-06-12 | 1 | -1/+1 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-11 | 1 | -11/+0 |
| |\| | | | | | | | | | Conflicts: mesalib/src/glsl/glcpp/.gitignore | ||||
 |
index : vcxsrv | |
| VcXsrv Windows X Server (X2Go/Arctica Builds) |
| aboutsummaryrefslogtreecommitdiff |