Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2012-02-01 | 13 | -474/+204 |
|\ | |||||
| * | xserver mesa pixman xkbcomp xkeyboard-config git update 1 feb 2012 | marha | 2012-02-01 | 13 | -474/+204 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-30 | 3 | -327/+243 |
|\| | |||||
| * | libxcb mesa git update 30 jan 2012 | marha | 2012-01-30 | 3 | -327/+243 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-28 | 22 | -590/+988 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/hw/xwin/InitOutput.c xorg-server/hw/xwin/win.h xorg-server/hw/xwin/winclipboardthread.c xorg-server/hw/xwin/winclipboardunicode.c xorg-server/hw/xwin/winclipboardwndproc.c xorg-server/hw/xwin/winclipboardwrappers.c xorg-server/hw/xwin/winengine.c xorg-server/hw/xwin/winkeybd.c xorg-server/hw/xwin/winkeybd.h xorg-server/hw/xwin/winkeynames.h xorg-server/hw/xwin/winmouse.c xorg-server/hw/xwin/winmultiwindowwm.c xorg-server/hw/xwin/winmultiwindowwndproc.c xorg-server/hw/xwin/winprefs.c xorg-server/hw/xwin/winwindow.h xorg-server/hw/xwin/winwndproc.c | ||||
| * | mesa xserver git update 28 jan 2012 | marha | 2012-01-28 | 22 | -590/+988 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-26 | 24 | -616/+704 |
|\| | |||||
| * | xwininfo xcb-proto mesa xserver git update 26 12 2012 | marha | 2012-01-26 | 24 | -616/+704 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-25 | 56 | -5451/+1309 |
|\| | |||||
| * | mesa git update 25 jan 2012 | marha | 2012-01-25 | 56 | -5451/+1309 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-24 | 5 | -4/+109 |
|\| | | | | | | | | | Conflicts: xorg-server/dix/grabs.c | ||||
| * | libX11 mesa xserver git update 24 jan 2012 | marha | 2012-01-24 | 5 | -4/+109 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-23 | 15 | -484/+124 |
|\| | |||||
| * | git update libX11 mesa libxcb xkeyboard-config 23 jan 2012 | marha | 2012-01-23 | 15 | -484/+124 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-20 | 20 | -265/+273 |
|\| | |||||
| * | xserver xkeyboard-config git update 20 jan 2012 | marha | 2012-01-20 | 20 | -265/+273 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-17 | 3 | -16/+10 |
|\| | |||||
| * | git update mesa pixman xserver 17 jan 2012 | marha | 2012-01-17 | 3 | -16/+10 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-13 | 46 | -540/+692 |
|\| | | | | | | | | | | | | | | | | | | | | | | | 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 | 46 | -540/+692 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-11 | 22 | -570/+1253 |
|\| | | | | | | | | | | | | | | | | | | | | | | | 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 | 22 | -570/+1253 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-09 | 25 | -984/+199 |
|\| | |||||
| * | xwininfo libX11 mesa mkfontscale xkeyboard-config git update 9 jan 2011 | marha | 2012-01-09 | 25 | -984/+199 |
| | | |||||
* | | Solved compile problem | marha | 2012-01-06 | 1 | -1/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-06 | 48 | -1644/+1170 |
|\| | | | | | | | | | | | 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 | 48 | -1645/+1171 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-29 | 23 | -1066/+1030 |
|\| | |||||
| * | xserver libX11 mesa xkeyboard-config git update 28 dec 2011 | marha | 2011-12-28 | 23 | -1066/+1030 |
| | | |||||
* | | Increaser version of swrast | marha | 2011-12-29 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-25 | 40 | -6747/+3609 |
|\| | |||||
| * | mesa xkeyboard-config xserver git update 25 dec 2011 | marha | 2011-12-25 | 40 | -6747/+3609 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-23 | 20 | -384/+656 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 20 | -384/+656 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-17 | 48 | -824/+1178 |
|\| | |||||
| * | libX11 libxtrans mesa xserver git update 17 dec 2011 | marha | 2011-12-17 | 48 | -824/+1178 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-14 | 18 | -2213/+2268 |
|\| | | | | | | | | | | | | | | | | | 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 | 6 | -2056/+2072 |
| | | |||||
| * | git update pixman mesa 13 dec 2011 | marha | 2011-12-13 | 13 | -157/+196 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-12 | 46 | -3663/+5438 |
|\| | |||||
| * | libxtrans libX11 libxcb xserver mesa git update 12 dec 2011 | marha | 2011-12-12 | 46 | -3663/+5438 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-08 | 4 | -7/+28 |
|\| | |||||
| * | git update glproto libX11 libxcb mesa xserver 8 dec 2011 | marha | 2011-12-08 | 4 | -7/+28 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-05 | 41 | -6324/+6689 |
|\| | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c | ||||
| * | xserver xkeyboard-config mesa git update 5 dec 2011 | marha | 2011-12-05 | 41 | -6324/+6689 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-29 | 50 | -1361/+1505 |
|\| | |||||
| * | mesa git update 29 nov 2011 | marha | 2011-11-29 | 50 | -1361/+1505 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-28 | 10 | -1173/+1313 |
|\| | |||||
| * | mesa git update 28 nov 2011 | marha | 2011-11-28 | 10 | -1173/+1313 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-25 | 15 | -112/+185 |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/glx/glxdriswrast.c xorg-server/glx/single2.c xorg-server/hw/xwin/winconfig.c xorg-server/os/osinit.c xorg-server/os/xdmcp.c xorg-server/xkb/xkbInit.c |