Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
* | | Freetype changed version to 2.4.7 in makefiles | marha | 2011-11-10 | 1 | -2/+2 |
| | | |||||
* | | Solved possible crashes due to null pointer access | marha | 2011-11-08 | 3 | -6/+10 |
| | | |||||
* | | miPointerSetPosition interface has been changes (solved problem of mouse | marha | 2011-11-08 | 1 | -1/+3 |
| | | | | | | | | not working anymore) | ||||
* | | Solved problem of QueryMonitors not working | marha | 2011-11-08 | 1 | -1/+1 |
| | | |||||
* | | Solved dependency problem | marha | 2011-11-08 | 1 | -1/+1 |
| | | |||||
* | | Solved compile problems | marha | 2011-11-07 | 1 | -10/+10 |
| | | |||||
* | | Solved compile problems | marha | 2011-11-07 | 1 | -16/+16 |
| | | |||||
* | | Synchronised files | marha | 2011-11-07 | 5 | -1578/+1716 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-07 | 1 | -1/+4 |
|\| | | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c | ||||
| * | xserver pixman mesa git update 7 nov 2011 | marha | 2011-11-07 | 1 | -1/+4 |
| | | |||||
* | | Solved compile problems | marha | 2011-11-04 | 3 | -3/+4 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-04 | 47 | -4533/+4656 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h xorg-server/hw/xwin/InitOutput.c xorg-server/hw/xwin/ddraw.h xorg-server/hw/xwin/winclipboardwndproc.c xorg-server/hw/xwin/winglobals.c xorg-server/hw/xwin/winmonitors.c xorg-server/hw/xwin/winprocarg.c xorg-server/hw/xwin/winwin32rootlesswndproc.c xorg-server/include/scrnintstr.h xorg-server/xkb/ddxList.c xorg-server/xkb/ddxLoad.c | ||||
| * | xserver pixman mesa git update 4 nov 2011 | marha | 2011-11-04 | 48 | -4601/+4665 |
| | | |||||
* | | Solved crash due to NULL pointer | marha | 2011-10-28 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-27 | 47 | -1966/+2573 |
|\| | |||||
| * | libX11 libXft mesa mkfontscale pixman xserver git update 26 okt 2011 | marha | 2011-10-26 | 47 | -1966/+2573 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-19 | 82 | -8849/+8365 |
|\| | | | | | | | | | Conflicts: xorg-server/include/os.h | ||||
| * | libX11 libXext libXft mesa libxcb mkfontscale pixman xserver | marha | 2011-10-19 | 82 | -8849/+8365 |
| | | | | | | | | xkeyboard-config git update 19 oct 2011 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-10 | 2 | -76/+257 |
|\| | |||||
| * | fontconfig libX11 mesa pixman xkeyboard-config git updte 10 oct 2011 | marha | 2011-10-10 | 2 | -76/+257 |
| | | |||||
* | | Handle more motif window decorating handling | marha | 2011-10-10 | 2 | -1/+22 |
| | | |||||
* | | Solved link error due to trunc not defined in VC++ | marha | 2011-10-06 | 1 | -0/+5 |
| | | |||||
* | | Solved compile warning | marha | 2011-10-06 | 1 | -1/+1 |
| | | |||||
* | | commented out not needed line | marha | 2011-10-06 | 1 | -1/+1 |
| | | |||||
* | | Added swrastwgl_dir dlls | marha | 2011-10-06 | 1 | -0/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-06 | 3 | -29/+29 |
|\| | |||||
| * | upgraded to inputproto-2.1.99.1 | marha | 2011-10-06 | 3 | -29/+29 |
| | | | | | | | | xwininfo fontconfig libXau mesa xkeyboard-config git update 6 oct 2011 | ||||
* | | Synchronised files | marha | 2011-10-05 | 3 | -166/+175 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-05 | 71 | -8379/+9174 |
|\| | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mapi/glapi/glapi.h mesalib/src/mesa/main/syncobj.h xorg-server/dix/events.c xorg-server/dix/getevents.c xorg-server/include/misc.h | ||||
| * | mkfontscale pixman xserver xtrans libX11 libXdmcp libxcb libXmu mesa git ↵ | marha | 2011-10-05 | 71 | -8380/+9175 |
| | | | | | | | | update 5 oct 2011 | ||||
* | | Added swrast dll based on wgl | marha | 2011-10-05 | 23 | -6/+37126 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-30 | 1 | -7/+7 |
|\| | | | | | | | | | Conflicts: openssl/Makefile | ||||
| * | mesa xkeyboard-config git update 30 sep 2011 | marha | 2011-09-30 | 1 | -7/+7 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-28 | 18 | -16650/+18355 |
|\| | |||||
| * | mesa pixman xkeyboard-config git update 28 sep 2011 | marha | 2011-09-28 | 18 | -16650/+18355 |
| | | |||||
* | | Do not use LockFile as a variable name since it gives a name collision with | marha | 2011-09-27 | 1 | -0/+4 |
| | | | | | | | | microsoft header files | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-27 | 49 | -4981/+5837 |
|\| | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mesa/main/version.c xorg-server/include/globals.h xorg-server/mi/misprite.c xorg-server/mi/mivaltree.c xorg-server/os/utils.c | ||||
| * | libX11 pixman mesa xserver git update 27 sep 2011 | marha | 2011-09-27 | 49 | -4961/+5817 |
| | | |||||
* | | Solved compilation error | marha | 2011-09-22 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-22 | 175 | -42208/+41292 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/Xext/dpms.c xorg-server/Xext/saver.c xorg-server/Xext/security.c xorg-server/Xext/shape.c xorg-server/Xext/sync.c xorg-server/Xi/opendev.c xorg-server/fb/wfbrename.h xorg-server/glx/glxserver.h xorg-server/hw/xwin/winwindowswm.c xorg-server/mi/miarc.c xorg-server/mi/miwideline.c xorg-server/os/io.c xorg-server/render/mipict.c |