Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2012-03-13 | 15 | -166/+57 |
|\ | |||||
| * | fontconfig mesa git update 13 Mar 2012 | marha | 2012-03-13 | 15 | -166/+57 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-03-12 | 21 | -5998/+7178 |
|\| | | | | | | | | | | | | | | | 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 | 21 | -5998/+7178 |
| | | |||||
* | | 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 | 3 | -19/+34 |
|\| | | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c | ||||
| * | fontconfig libXau libXdmcp libXext libXft libXinerama libXmu pixman mesa | marha | 2012-03-08 | 3 | -19/+34 |
| | | | | | | | | git update 8 Mar 2012 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-03-05 | 19 | -766/+792 |
|\| | |||||
| * | libfontenc xserver pixman mesa git update 5 Mar 2012 | marha | 2012-03-05 | 19 | -766/+792 |
| | | | | | | | | | | | | | | 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 | 5 | -31/+38 |
|\| | |||||
| * | xserver fontconfig mesa pixman git update 29 Feb 2012 | marha | 2012-02-29 | 5 | -31/+38 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-02-27 | 33 | -366/+493 |
|\| | | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c | ||||
| * | fontconfig pixman mesa git update 27 Feb 2012 | marha | 2012-02-27 | 33 | -366/+493 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-02-24 | 6 | -19/+66 |
|\| | |||||
| * | fontconfig libX11 pixman xserver git update 24 Feb 2012 | marha | 2012-02-24 | 6 | -19/+66 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-02-22 | 29 | -431/+434 |
|\| | |||||
| * | fontconfig libX11 libxcb mesa pixman xserver git update 22 Feb 2012 | marha | 2012-02-22 | 29 | -431/+434 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-02-13 | 29 | -1106/+1033 |
|\| | |||||
| * | libX11 libxcb mesa xserver mkfontscale git update 13 feb 2012 | marha | 2012-02-13 | 29 | -1106/+1033 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-02-09 | 11 | -283/+250 |
|\| | |||||
| * | mesa git update 8 feb 2012 | marha | 2012-02-08 | 11 | -283/+250 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-02-06 | 16 | -158/+189 |
|\| | |||||
| * | mesa git update 6 feb 2012 | marha | 2012-02-06 | 16 | -158/+189 |
| | | |||||
* | | 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 |