aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main/texcompress_s3tc.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-09-171-14/+4
|\ | | | | | | | | | | Conflicts: mesalib/src/mesa/main/syncobj.h pixman/pixman/pixman-mmx.c
| * mesa xserver pixman git update 17 sep 2012marha2012-09-171-14/+4
| |
* | Merge remote-tracking branch 'origin/released'marha2012-09-041-8/+4
|\| | | | | | | | | | | | | | | | | | | 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 2012marha2012-09-041-8/+4
| |
| * xwininfo fontconfig libX11 libXau libXext libxcb mesa pixmanmarha2012-08-271-28/+32
| | | | | | | | xkeyboard-config git update 27 Aug 2012
* | xwininfo fontconfig libX11 libXau libXext libxcb mesa pixmanmarha2012-09-041-28/+32
| | | | | | | | xkeyboard-config git update 27 Aug 2012
* | Merge remote-tracking branch 'origin/released'marha2012-01-251-4/+4
|\|
| * mesa git update 25 jan 2012marha2012-01-251-4/+4
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-061-32/+7
|\| | | | | | | | | | | Conflicts: mesalib/src/glsl/link_uniforms.cpp mesalib/src/mesa/drivers/dri/common/drisw_util.c
| * libX11 mesa pixman git update 6 jan 2012marha2012-01-061-32/+7
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-271-10/+8
|\|
| * libX11 libXft mesa mkfontscale pixman xserver git update 26 okt 2011marha2011-10-261-10/+8
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-101-4/+12
|\|
| * fontconfig libX11 mesa pixman xkeyboard-config git updte 10 oct 2011marha2011-10-101-4/+12
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-061-8/+4
|\|
| * upgraded to inputproto-2.1.99.1marha2011-10-061-8/+4
| | | | | | | | xwininfo fontconfig libXau mesa xkeyboard-config git update 6 oct 2011
* | Merge remote-tracking branch 'origin/released'marha2011-10-051-1/+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 ↵marha2011-10-051-1/+1
| | | | | | | | update 5 oct 2011
* | Merge remote-tracking branch 'origin/released'marha2011-09-221-67/+65
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * libxtrans libX11 libX11 libXext mesa xserver git update 22 sep 2011marha2011-09-221-67/+65
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-191-18/+21
|\| | | | | | | | | Conflicts: libfontenc/src/fontenc.c
| * xtrans libX11 libXext libXdmcp libXau libXft libXinerama libXmu libfontencmarha2011-09-191-18/+21
| | | | | | | | mesa git update 19 sept 2011
* | Synchronised line endinge with release branchmarha2011-09-121-562/+562
| |
* | svn merge ^/branches/released .marha2011-05-021-16/+0
|\|
| * mesa git update 1 May 2011marha2011-05-021-574/+558
| |
* | svn merge ^/branches/released .marha2011-01-081-0/+2
|\|
| * xserver mesa libX11 xkbcomp pixman git update 8/1/2011marha2011-01-081-0/+2
| |
* | svn merge ^/branches/released .marha2010-12-291-581/+576
|\|
| * xserver and mesa git update 28-12-2010marha2010-12-281-577/+572
| |
* | Added compilation of dxtxn.dllmarha2010-12-251-0/+4
|/
* Updated to mesalib 7.9marha2010-11-221-8/+11
|
* Updated to following packages:marha2010-04-021-4/+4
| | | | | mesa-7.8
* Updated to Mesa 7.7marha2010-03-071-242/+55
|
* Added MesaLib-7.6marha2009-10-081-0/+761