aboutsummaryrefslogtreecommitdiff
path: root/xorg-server
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-01-1322-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 2012marha2012-01-1322-497/+507
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-1150-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 2012marha2012-01-1151-3503/+3526
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-091-1/+51
|\|
| * xwininfo libX11 mesa mkfontscale xkeyboard-config git update 9 jan 2011marha2012-01-091-1/+51
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-297-418/+537
|\|
| * xserver libX11 mesa xkeyboard-config git update 28 dec 2011marha2011-12-287-418/+537
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-252-222/+532
|\|
| * mesa xkeyboard-config xserver git update 25 dec 2011marha2011-12-252-222/+532
| |
* | Solved compilation errorsmarha2011-12-231-1/+1
| |
* | Synchronised filesmarha2011-12-232-3/+13
| |
* | Solved compile errormarha2011-12-231-1/+1
| |
* | Back previous versionmarha2011-12-231-0/+1
| |
* | Removed unneeded source filemarha2011-12-231-1/+0
| |
* | Solved compile warningmarha2011-12-231-1/+1
| |
* | synchronised filesmarha2011-12-232-26/+24
| |
* | Added new sources to makefilesmarha2011-12-232-4/+5
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-2360-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 2011marha2011-12-2367-11852/+25886
| |
* | Increased version to 1.11.3.0marha2011-12-172-2/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-175-24/+91
|\|
| * libX11 libxtrans mesa xserver git update 17 dec 2011marha2011-12-175-24/+91
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-1684-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 2011marha2011-12-1684-7227/+7431
| |
* | Added -parentprocessid command line parametermarha2011-12-161-0/+12
| |
* | Solved compilation errormarha2011-12-161-18/+18
| |
* | Synchronised filesmarha2011-12-1510-1222/+1225
| |
* | Solved compilation warning: possible use of uninitialised variablemarha2011-12-151-2/+3
| |
* | Solved compilation errormarha2011-12-151-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-1225-2031/+2649
|\|
| * libxtrans libX11 libxcb xserver mesa git update 12 dec 2011marha2011-12-1225-2031/+2649
| |
* | Include dix-config.h to remove warningmarha2011-12-081-0/+4
| |
* | Synchronised dix-config.h and dix-config.h.inmarha2011-12-083-12/+4
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-0831-2131/+2105
|\|
| * git update glproto libX11 libxcb mesa xserver 8 dec 2011marha2011-12-0831-2131/+2105
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-0522-4079/+4052
|\| | | | | | | | | Conflicts: xorg-server/dix/dispatch.c
| * xserver xkeyboard-config mesa git update 5 dec 2011marha2011-12-0522-134/+107
| |
* | Solved missing compilation of strndup.cmarha2011-11-251-0/+1
| |
* | strndup.c added in makefilemarha2011-11-251-0/+5
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-25116-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 2011marha2011-11-25118-17944/+18097
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-2119-1932/+1957
|\|
| * xserver xkeyboard-config mesa git update 21 nov 2011marha2011-11-2119-1932/+1957
| |
* | Bumped version to 1.11.2marha2011-11-182-2/+2
| |
* | Updated makefile with new version of freetypemarha2011-11-181-2/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-184-0/+15
|\|
| * xkeyboard-config mesa git update 18 nov 2011marha2011-11-184-0/+15
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-1712-1421/+1414
|\| | | | | | | | | Conflicts: mesalib/src/mesa/swrast/s_readpix.c
| * xserver mesa git update 17 nov 2011marha2011-11-1712-1421/+1414
| |