Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2012-01-13 | 92 | -5493/+5942 |
|\ | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libxcb/src/xcb_auth.c libxcb/src/xcb_conn.c libxcb/src/xcb_out.c libxcb/src/xcb_util.c xorg-server/dix/dispatch.c xorg-server/include/dixstruct.h xorg-server/include/misc.h xorg-server/os/connection.c | ||||
| * | libxtrans libXdmcp libxcb mesa xserver git update 13 jan 2012 | marha | 2012-01-13 | 92 | -5463/+5912 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-11 | 2 | -1/+2 |
|\| | |||||
| * | Switched to inputproto-2.1.99.5 | marha | 2012-01-11 | 2 | -1/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-11 | 99 | -4571/+5364 |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: pixman/pixman/pixman-trap.c xorg-server/Xext/xace.c xorg-server/dix/dispatch.c xorg-server/hw/xwin/winclipboardthread.c xorg-server/hw/xwin/winengine.c xorg-server/hw/xwin/winwin32rootlesswindow.c xorg-server/include/dixstruct.h xorg-server/os/connection.c | ||||
| * | mesa pixman xserver git update 11 jan 2012 | marha | 2012-01-11 | 101 | -4503/+5286 |
| | | |||||
* | | Removed deleted file from project | marha | 2012-01-10 | 2 | -4/+0 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-09 | 44 | -1254/+661 |
|\| | |||||
| * | xwininfo libX11 mesa mkfontscale xkeyboard-config git update 9 jan 2011 | marha | 2012-01-09 | 44 | -1254/+661 |
| | | |||||
* | | Solved compile problem | marha | 2012-01-06 | 1 | -1/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-06 | 78 | -1946/+2109 |
|\| | | | | | | | | | | | Conflicts: mesalib/src/glsl/link_uniforms.cpp mesalib/src/mesa/drivers/dri/common/drisw_util.c | ||||
| * | libX11 mesa pixman git update 6 jan 2012 | marha | 2012-01-06 | 79 | -1948/+2111 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-29 | 35 | -1636/+1751 |
|\| | |||||
| * | xserver libX11 mesa xkeyboard-config git update 28 dec 2011 | marha | 2011-12-28 | 35 | -1636/+1751 |
| | | |||||
* | | Increaser version of swrast | marha | 2011-12-29 | 1 | -1/+1 |
| | | |||||
* | | Solved compilation error | marha | 2011-12-25 | 2 | -3/+73 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-25 | 44 | -6984/+4210 |
|\| | |||||
| * | mesa xkeyboard-config xserver git update 25 dec 2011 | marha | 2011-12-25 | 44 | -6984/+4210 |
| | | |||||
* | | Solved compilation errors | marha | 2011-12-23 | 2 | -2/+2 |
| | | |||||
* | | Solved compilation error due to name conflict | marha | 2011-12-23 | 2 | -0/+8 |
| | | |||||
* | | Synchronised files | marha | 2011-12-23 | 32 | -159/+161 |
| | | |||||
* | | Solved error in comparison script | marha | 2011-12-23 | 1 | -5/+6 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-23 | 4 | -11/+21 |
|\| | |||||
| * | Updated to inputproto-2.1.99.4 | marha | 2011-12-23 | 4 | -21/+21 |
| | | |||||
* | | Solved compile error | marha | 2011-12-23 | 1 | -1/+1 |
| | | |||||
* | | Back previous version | marha | 2011-12-23 | 2 | -0/+2 |
| | | |||||
* | | Removed unneeded source file | marha | 2011-12-23 | 1 | -1/+0 |
| | | |||||
* | | Solved compile warning | marha | 2011-12-23 | 1 | -1/+1 |
| | | |||||
* | | synchronised files | marha | 2011-12-23 | 3 | -27/+24 |
| | | |||||
* | | Added new sources to makefiles | marha | 2011-12-23 | 2 | -4/+5 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-23 | 87 | -4876/+8582 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/glx/dispatch.h xorg-server/glx/glapi.c xorg-server/glx/indirect_dispatch.h xorg-server/glx/indirect_reqsize.c xorg-server/glx/indirect_reqsize.h xorg-server/glx/indirect_size.h xorg-server/glx/indirect_size_get.c xorg-server/glx/indirect_size_get.h xorg-server/glx/indirect_table.c xorg-server/mi/mieq.c | ||||
| * | git mesa pixman xserver xkeyboard-config update 24 dec 2011 | marha | 2011-12-23 | 94 | -12365/+26767 |
| | | |||||
* | | Solved compilation warnings1.11.3.0 | marha | 2011-12-17 | 2 | -2/+4 |
| | | |||||
* | | Make sure the correct bison is used | marha | 2011-12-17 | 1 | -1/+1 |
| | | |||||
* | | Added release note for 1.11.3.0 | marha | 2011-12-17 | 1 | -0/+734 |
| | | |||||
* | | Increased version to 1.11.3.0 | marha | 2011-12-17 | 3 | -3/+3 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-17 | 65 | -1767/+2414 |
|\| | |||||
| * | libX11 libxtrans mesa xserver git update 17 dec 2011 | marha | 2011-12-17 | 65 | -1767/+2414 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-16 | 84 | -7243/+7447 |
|\| | | | | | | | | | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c xorg-server/dix/registry.c xorg-server/include/resource.h xorg-server/os/access.c xorg-server/os/auth.c | ||||
| * | xserver git update 16 dec 2011 | marha | 2011-12-16 | 84 | -7227/+7431 |
| | | |||||
* | | Added -parentprocessid command line parameter | marha | 2011-12-16 | 1 | -0/+12 |
| | | |||||
* | | Solved compilation error | marha | 2011-12-16 | 1 | -18/+18 |
| | | |||||
* | | Synchronised files | marha | 2011-12-15 | 11 | -1224/+1229 |
| | | |||||
* | | Solved compilation warning: possible use of uninitialised variable | marha | 2011-12-15 | 1 | -2/+3 |
| | | |||||
* | | Added missing files to project files | marha | 2011-12-15 | 4 | -8/+12 |
| | | |||||
* | | Solved compilation error | marha | 2011-12-15 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-14 | 29 | -3085/+3251 |
|\| | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mapi/glapi/gen/EXT_gpu_shader4.xml mesalib/src/mapi/glapi/gen/glX_proto_recv.py mesalib/src/mapi/glapi/gen/glX_proto_size.py mesalib/src/mapi/glapi/gen/gl_gentable.py mesalib/src/mapi/glapi/gen/gl_table.py | ||||
| * | git update mesa 14 dec 2011 | marha | 2011-12-14 | 17 | -2901/+3005 |
| | | |||||
| * | git update pixman mesa 13 dec 2011 | marha | 2011-12-13 | 14 | -169/+240 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-12 | 80 | -6007/+8514 |
|\| |