Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2012-01-13 | 22 | -498/+508 |
|\ | | | | | | | | | | | | | | | | | | | | | | | 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 | 22 | -497/+507 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-11 | 50 | -3572/+3605 |
|\| | | | | | | | | | | | | | | | | | | | | | | | 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 | 51 | -3503/+3526 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-09 | 1 | -1/+51 |
|\| | |||||
| * | xwininfo libX11 mesa mkfontscale xkeyboard-config git update 9 jan 2011 | marha | 2012-01-09 | 1 | -1/+51 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-29 | 7 | -418/+537 |
|\| | |||||
| * | xserver libX11 mesa xkeyboard-config git update 28 dec 2011 | marha | 2011-12-28 | 7 | -418/+537 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-25 | 2 | -222/+532 |
|\| | |||||
| * | mesa xkeyboard-config xserver git update 25 dec 2011 | marha | 2011-12-25 | 2 | -222/+532 |
| | | |||||
* | | Solved compilation errors | marha | 2011-12-23 | 1 | -1/+1 |
| | | |||||
* | | Synchronised files | marha | 2011-12-23 | 2 | -3/+13 |
| | | |||||
* | | Solved compile error | marha | 2011-12-23 | 1 | -1/+1 |
| | | |||||
* | | Back previous version | marha | 2011-12-23 | 1 | -0/+1 |
| | | |||||
* | | 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 | 2 | -26/+24 |
| | | |||||
* | | Added new sources to makefiles | marha | 2011-12-23 | 2 | -4/+5 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-23 | 60 | -4363/+7701 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 67 | -11852/+25886 |
| | | |||||
* | | Increased version to 1.11.3.0 | marha | 2011-12-17 | 2 | -2/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-17 | 5 | -24/+91 |
|\| | |||||
| * | libX11 libxtrans mesa xserver git update 17 dec 2011 | marha | 2011-12-17 | 5 | -24/+91 |
| | | |||||
* | | 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 | 10 | -1222/+1225 |
| | | |||||
* | | Solved compilation warning: possible use of uninitialised variable | marha | 2011-12-15 | 1 | -2/+3 |
| | | |||||
* | | Solved compilation error | marha | 2011-12-15 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-12 | 25 | -2031/+2649 |
|\| | |||||
| * | libxtrans libX11 libxcb xserver mesa git update 12 dec 2011 | marha | 2011-12-12 | 25 | -2031/+2649 |
| | | |||||
* | | Include dix-config.h to remove warning | marha | 2011-12-08 | 1 | -0/+4 |
| | | |||||
* | | Synchronised dix-config.h and dix-config.h.in | marha | 2011-12-08 | 3 | -12/+4 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-08 | 31 | -2131/+2105 |
|\| | |||||
| * | git update glproto libX11 libxcb mesa xserver 8 dec 2011 | marha | 2011-12-08 | 31 | -2131/+2105 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-05 | 22 | -4079/+4052 |
|\| | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c | ||||
| * | xserver xkeyboard-config mesa git update 5 dec 2011 | marha | 2011-12-05 | 22 | -134/+107 |
| | | |||||
* | | Solved missing compilation of strndup.c | marha | 2011-11-25 | 1 | -0/+1 |
| | | |||||
* | | strndup.c added in makefile | marha | 2011-11-25 | 1 | -0/+5 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-25 | 116 | -18045/+18198 |
|\| | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | mesa xserver pixman git update 25 nov 2011 | marha | 2011-11-25 | 118 | -17944/+18097 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-21 | 19 | -1932/+1957 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 21 nov 2011 | marha | 2011-11-21 | 19 | -1932/+1957 |
| | | |||||
* | | Bumped version to 1.11.2 | marha | 2011-11-18 | 2 | -2/+2 |
| | | |||||
* | | Updated makefile with new version of freetype | marha | 2011-11-18 | 1 | -2/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-18 | 4 | -0/+15 |
|\| | |||||
| * | xkeyboard-config mesa git update 18 nov 2011 | marha | 2011-11-18 | 4 | -0/+15 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-17 | 12 | -1421/+1414 |
|\| | | | | | | | | | Conflicts: mesalib/src/mesa/swrast/s_readpix.c | ||||
| * | xserver mesa git update 17 nov 2011 | marha | 2011-11-17 | 12 | -1421/+1414 |
| | |