Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2012-09-17 | 75 | -1176/+41 |
|\ | | | | | | | | | | | Conflicts: mesalib/src/mesa/main/syncobj.h pixman/pixman/pixman-mmx.c | ||||
| * | mesa xserver pixman git update 17 sep 2012 | marha | 2012-09-17 | 75 | -1176/+41 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-09-14 | 8 | -80/+160 |
|\| | |||||
| * | fontconfig libX11 mesa xkeyboard-config git update 14 sep 2012 | marha | 2012-09-14 | 8 | -80/+160 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-09-06 | 30 | -157/+132 |
|\| | |||||
| * | xserver mesa git update 6 sep 2012 | marha | 2012-09-06 | 30 | -157/+132 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-09-05 | 1 | -1/+1 |
|\| | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c | ||||
| * | xserver mesa git update 4 sep 2012 | marha | 2012-09-05 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-09-04 | 7 | -82/+52 |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: libxcb/src/xcb_ext.c libxcb/src/xcb_xid.c mesalib/src/mesa/main/.gitignore mesalib/src/mesa/main/eval.c mesalib/src/mesa/main/imports.h mesalib/src/mesa/main/macros.h | ||||
| * | mesa git update 4 sep 2012 | marha | 2012-09-04 | 7 | -82/+52 |
| | | |||||
| * | mesa xkeyboard-config git update 3 sep 2012 | marha | 2012-09-03 | 11 | -154/+133 |
| | | |||||
| * | randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xserver | marha | 2012-08-31 | 37 | -1791/+1349 |
| | | | | | | | | git update 31 Aug 2012 | ||||
| * | xwininfo fontconfig libX11 libXau libXext libxcb mesa pixman | marha | 2012-08-27 | 33 | -1689/+1392 |
| | | | | | | | | xkeyboard-config git update 27 Aug 2012 | ||||
* | | mesa xkeyboard-config git update 3 sep 2012 | marha | 2012-09-04 | 11 | -154/+133 |
| | | |||||
* | | randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xserver | marha | 2012-09-04 | 37 | -1791/+1349 |
| | | | | | | | | git update 31 Aug 2012 | ||||
* | | xwininfo fontconfig libX11 libXau libXext libxcb mesa pixman | marha | 2012-09-04 | 33 | -1689/+1392 |
| | | | | | | | | xkeyboard-config git update 27 Aug 2012 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-08-22 | 1 | -30/+2 |
|\| | |||||
| * | mesa xserver git update 22 Aug 2012 | marha | 2012-08-22 | 1 | -30/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-08-21 | 7 | -423/+1779 |
|\| | |||||
| * | xserver xkeyboard-config mesa pixman git update 21 Aug 2012 | marha | 2012-08-21 | 7 | -423/+1779 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-08-17 | 2 | -1/+3 |
|\| | |||||
| * | fontconfig mesa git update 17 Aug 2012 | marha | 2012-08-17 | 2 | -1/+3 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-08-16 | 19 | -251/+1519 |
|\| | |||||
| * | libxcb xserver mesa git update 16 Aug 2012 | marha | 2012-08-16 | 19 | -251/+1519 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-08-13 | 21 | -105/+153 |
|\| | |||||
| * | mesa pixman xkeyboard-config xserver git update 13 Aug 2012 | marha | 2012-08-13 | 21 | -105/+153 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-08-03 | 12 | -29/+89 |
|\| | |||||
| * | pixman mesa git update 3 Aug 2012 | marha | 2012-08-03 | 12 | -29/+89 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-08-01 | 3 | -0/+260 |
|\| | |||||
| * | git mesa update 1 Aug 2012 | marha | 2012-08-01 | 3 | -0/+260 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-31 | 47 | -1799/+2375 |
|\| | |||||
| * | fontconfig libXext mesa xserver pixman git update 31 Jul 2012 | marha | 2012-07-31 | 47 | -1799/+2375 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-18 | 5 | -3/+78 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/glsl/.gitignore xorg-server/Xext/panoramiX.c xorg-server/hw/xwin/win.h xorg-server/hw/xwin/winclipboardinit.c xorg-server/hw/xwin/winclipboardthread.c xorg-server/hw/xwin/winclipboardunicode.c xorg-server/hw/xwin/winclipboardwrappers.c xorg-server/hw/xwin/winclipboardxevents.c xorg-server/hw/xwin/wincreatewnd.c xorg-server/hw/xwin/windialogs.c xorg-server/hw/xwin/winerror.c xorg-server/hw/xwin/winmonitors.c xorg-server/hw/xwin/winmultiwindowwm.c xorg-server/hw/xwin/winprocarg.c xorg-server/hw/xwin/winwndproc.c | ||||
| * | fontconfig mesa xserver git update 18 Jul 2012 | marha | 2012-07-18 | 5 | -3/+78 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-13 | 16 | -27/+300 |
|\| | | | | | | | | | | | Conflicts: xorg-server/glx/glxext.c xorg-server/hw/xwin/InitOutput.c | ||||
| * | xserver mesa git update 13 Jul 2012 | marha | 2012-07-13 | 16 | -27/+300 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-11 | 6 | -9/+119 |
|\| | | | | | | | | | Conflicts: xorg-server/dix/devices.c | ||||
| * | mesa xserver pixman git update 11 Jul 2012 | marha | 2012-07-11 | 6 | -9/+119 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-06 | 3 | -10/+2 |
|\| | | | | | | | | | | | | | | | 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 | 3 | -10/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-04 | 1 | -7/+14 |
|\| | | | | | | | | | | | Conflicts: xorg-server/include/misc.h xorg-server/os/utils.c | ||||
| * | mesa xserver git update 4 Jul 2012 | marha | 2012-07-04 | 1 | -7/+14 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-02 | 1 | -6/+0 |
|\| | | | | | | | | | Conflicts: pixman/pixman/pixman-sse2.c | ||||
| * | mesa pixman xserver git update 2 Jul 2012 | marha | 2012-07-02 | 1 | -6/+0 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-29 | 8 | -22/+99 |
|\| | | | | | | | | | | | Conflicts: xorg-server/hw/xwin/glx/gen_gl_wrappers.py xorg-server/hw/xwin/glx/indirect.c | ||||
| * | xkeyboard-config xserver pixman mesa git update 29 Jun 2012 | marha | 2012-06-29 | 8 | -22/+99 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-28 | 12 | -93/+136 |
|\| | |||||
| * | xkeyboard-config mesa fontconfig randrproto git update 28 Jun 2012 | marha | 2012-06-28 | 12 | -93/+136 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-22 | 9 | -71/+384 |
|\| | | | | | | | | | Conflicts: mesalib/src/mapi/glapi/gen/.gitignore | ||||
| * | mesa xserver libxcb fontconfig | marha | 2012-06-22 | 9 | -71/+384 |
| | |