Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2012-03-12 | 18 | -5998/+7170 |
|\ | | | | | | | | | | | | | | | Conflicts: libX11/src/OpenDis.c libX11/src/xcb_io.c xorg-server/xkeyboard-config/keymap/sun_vndr/all.in xorg-server/xkeyboard-config/semantics/default.in | ||||
| * | xkeyboard-config fontconfig libX11 libXft libxcb mesa git update 12 Mar 2012 | marha | 2012-03-12 | 18 | -5998/+7170 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-03-09 | 4 | -73/+106 |
|\| | | | | | | | | | Conflicts: libxcb/src/xcb_in.c | ||||
| * | libxcb fontconfig pixman mesa git update 9 Mar 2012 | marha | 2012-03-09 | 4 | -73/+106 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-03-08 | 2 | -19/+22 |
|\| | | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c | ||||
| * | fontconfig libXau libXdmcp libXext libXft libXinerama libXmu pixman mesa | marha | 2012-03-08 | 2 | -19/+22 |
| | | | | | | | | git update 8 Mar 2012 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-03-05 | 10 | -399/+263 |
|\| | |||||
| * | libfontenc xserver pixman mesa git update 5 Mar 2012 | marha | 2012-03-05 | 10 | -399/+263 |
| | | | | | | | | | | | | | | font-util-1.3.0 xclock-1.0.6 libXfont-1.4.5 inputproto-2.2 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-02-29 | 2 | -10/+16 |
|\| | |||||
| * | xserver fontconfig mesa pixman git update 29 Feb 2012 | marha | 2012-02-29 | 2 | -10/+16 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-02-27 | 4 | -149/+124 |
|\| | | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c | ||||
| * | fontconfig pixman mesa git update 27 Feb 2012 | marha | 2012-02-27 | 4 | -149/+124 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-02-24 | 2 | -3/+30 |
|\| | |||||
| * | fontconfig libX11 pixman xserver git update 24 Feb 2012 | marha | 2012-02-24 | 2 | -3/+30 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-02-22 | 13 | -94/+281 |
|\| | |||||
| * | fontconfig libX11 libxcb mesa pixman xserver git update 22 Feb 2012 | marha | 2012-02-22 | 13 | -94/+281 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-02-13 | 13 | -201/+83 |
|\| | |||||
| * | libX11 libxcb mesa xserver mkfontscale git update 13 feb 2012 | marha | 2012-02-13 | 13 | -201/+83 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-02-09 | 8 | -282/+240 |
|\| | |||||
| * | mesa git update 8 feb 2012 | marha | 2012-02-08 | 8 | -282/+240 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-02-06 | 12 | -151/+166 |
|\| | |||||
| * | mesa git update 6 feb 2012 | marha | 2012-02-06 | 12 | -151/+166 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-02-01 | 5 | -327/+182 |
|\| | |||||
| * | xserver mesa pixman xkbcomp xkeyboard-config git update 1 feb 2012 | marha | 2012-02-01 | 5 | -327/+182 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-28 | 9 | -235/+593 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 9 | -235/+593 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-26 | 7 | -22/+48 |
|\| | |||||
| * | xwininfo xcb-proto mesa xserver git update 26 12 2012 | marha | 2012-01-26 | 7 | -22/+48 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-25 | 18 | -254/+431 |
|\| | |||||
| * | mesa git update 25 jan 2012 | marha | 2012-01-25 | 18 | -254/+431 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-23 | 5 | -131/+119 |
|\| | |||||
| * | git update libX11 mesa libxcb xkeyboard-config 23 jan 2012 | marha | 2012-01-23 | 5 | -131/+119 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-20 | 13 | -248/+232 |
|\| | |||||
| * | xserver xkeyboard-config git update 20 jan 2012 | marha | 2012-01-20 | 13 | -248/+232 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-17 | 2 | -5/+3 |
|\| | |||||
| * | git update mesa pixman xserver 17 jan 2012 | marha | 2012-01-17 | 2 | -5/+3 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-13 | 28 | -193/+301 |
|\| | | | | | | | | | | | | | | | | | | | | | | | 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 | 28 | -193/+301 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-11 | 10 | -32/+587 |
|\| | | | | | | | | | | | | | | | | | | | | | | | 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 | 10 | -32/+587 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-09 | 9 | -54/+69 |
|\| | |||||
| * | xwininfo libX11 mesa mkfontscale xkeyboard-config git update 9 jan 2011 | marha | 2012-01-09 | 9 | -54/+69 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-06 | 23 | -724/+487 |
|\| | | | | | | | | | | | 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 | 23 | -724/+487 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-29 | 11 | -193/+156 |
|\| | |||||
| * | xserver libX11 mesa xkeyboard-config git update 28 dec 2011 | marha | 2011-12-28 | 11 | -193/+156 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-25 | 11 | -489/+440 |
|\| | |||||
| * | mesa xkeyboard-config xserver git update 25 dec 2011 | marha | 2011-12-25 | 11 | -489/+440 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-23 | 11 | -34/+183 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 11 | -34/+183 |
| | |