Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2012-08-16 | 1 | -0/+2 |
|\ | |||||
| * | libxcb xserver mesa git update 16 Aug 2012 | marha | 2012-08-16 | 1 | -0/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-13 | 1 | -2/+48 |
|\| | | | | | | | | | | | Conflicts: xorg-server/glx/glxext.c xorg-server/hw/xwin/InitOutput.c | ||||
| * | xserver mesa git update 13 Jul 2012 | marha | 2012-07-13 | 1 | -2/+48 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-11 | 1 | -1/+21 |
|\| | | | | | | | | | Conflicts: xorg-server/dix/devices.c | ||||
| * | mesa xserver pixman git update 11 Jul 2012 | marha | 2012-07-11 | 1 | -1/+21 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-28 | 1 | -2/+2 |
|\| | |||||
| * | xkeyboard-config mesa fontconfig randrproto git update 28 Jun 2012 | marha | 2012-06-28 | 1 | -2/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-22 | 1 | -1/+3 |
|\| | | | | | | | | | Conflicts: mesalib/src/mapi/glapi/gen/.gitignore | ||||
| * | mesa xserver libxcb fontconfig | marha | 2012-06-22 | 1 | -1/+3 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-21 | 1 | -1/+2 |
|\| | |||||
| * | mesa pixman xkeyboard-config xserver git update 21 Jun 2012 | marha | 2012-06-21 | 1 | -1/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-15 | 1 | -33/+185 |
|\| | | | | | | | | | | | | | | | Conflicts: fontconfig/src/fcint.h fontconfig/src/fcstat.c mesalib/src/mapi/glapi/gen/GL3x.xml xorg-server/glx/glxext.h | ||||
| * | fontconfig mesa pixman xserver git update 15 juni 2012 | marha | 2012-06-15 | 1 | -33/+185 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-03-28 | 1 | -22/+78 |
|\| | |||||
| * | fontconfig libxcb xcb-proto mesa xserver git update 27 Mar 2012 | marha | 2012-03-27 | 1 | -22/+78 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-03-12 | 1 | -0/+4 |
|\| | | | | | | | | | | | | | | | 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 | 1 | -0/+4 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-28 | 1 | -0/+2 |
|\| | |||||
| * | mesa git update 28 nov 2011 | marha | 2011-11-28 | 1 | -0/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-04 | 1 | -0/+2 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -0/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-05 | 1 | -118/+1 |
|\| | | | | | | | | | | | | | | | | | 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 | 1 | -118/+1 |
| | | | | | | | | update 5 oct 2011 | ||||
* | | Synchronised line endinge with release branch | marha | 2011-09-12 | 1 | -12542/+12542 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-06 | 1 | -0/+2 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/docs/GL3.txt mesalib/src/mapi/glapi/gen/Makefile mesalib/src/mapi/glapi/gen/gl_API.xml mesalib/src/mapi/glapi/glapi_mapi_tmp.h mesalib/src/mapi/glapi/glapi_sparc.S mesalib/src/mapi/glapi/glapi_x86-64.S mesalib/src/mapi/glapi/glapi_x86.S mesalib/src/mapi/glapi/glapitable.h mesalib/src/mapi/glapi/glapitemp.h mesalib/src/mapi/glapi/glprocs.h mesalib/src/mesa/main/dd.h mesalib/src/mesa/main/enums.c mesalib/src/mesa/main/mtypes.h mesalib/src/mesa/main/remap_helper.h mesalib/src/mesa/main/uniforms.c mesalib/src/mesa/state_tracker/st_draw.c mesalib/src/mesa/state_tracker/st_extensions.c mesalib/src/mesa/vbo/vbo_attrib_tmp.h mesalib/src/mesa/vbo/vbo_save_api.c | ||||
| * | mesa git update 6 sep 2011 | marha | 2011-09-06 | 1 | -0/+2 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-05-03 | 1 | -0/+1 |
|\| | |||||
| * | xkeyboard libxcb pixman mesa git update 2 May 2011 | marha | 2011-05-03 | 1 | -0/+1 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-27 | 1 | -0/+2 |
|\| | |||||
| * | xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011 | marha | 2011-04-27 | 1 | -0/+2 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-12 | 1 | -0/+2 |
|\| | |||||
| * | mesa libXext pixman git update 12 Apr 2011 | marha | 2011-04-12 | 1 | -12535/+12537 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-06 | 1 | -0/+2 |
|\| | |||||
| * | xserver libX11 libxcb mesa git update 6 Apr 2011 | marha | 2011-04-06 | 1 | -12533/+12535 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-30 | 1 | -0/+1 |
|\| | |||||
| * | mesa git update 30 Mar 2011 | marha | 2011-03-30 | 1 | -12532/+12533 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-15 | 1 | -0/+2 |
|\| | |||||
| * | xserver libX11 libxcb mesa git update 15 Mar 2011 | marha | 2011-03-15 | 1 | -0/+2 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-01-16 | 1 | -0/+5 |
|\| | |||||
| * | mesalib git update 16/1/2011 | marha | 2011-01-16 | 1 | -0/+3 |
| | | |||||
| * | mesalib git update 14/1/2011 | marha | 2011-01-15 | 1 | -0/+2 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-12-29 | 1 | -12514/+12525 |
|\| | |||||
| * | xserver and mesa git update 28-12-2010 | marha | 2010-12-28 | 1 | -12514/+12525 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-11-29 | 1 | -4/+10 |
|\| | |||||
| * | Updated to mesalib 7.9 | marha | 2010-11-22 | 1 | -4/+10 |
| | | |||||
| * | Preperation for new release of mesa | marha | 2010-11-22 | 1 | -0/+12508 |
| | |||||
* | Preperation of new merge with directory moves | marha | 2010-11-22 | 1 | -0/+12508 |