aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main/texcompress.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-07-261-27/+178
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libX11/specs/libX11/CH11.xml mesalib/src/glsl/main.cpp mesalib/src/mesa/main/compiler.h mesalib/src/mesa/main/get.c mesalib/src/mesa/main/texcompress.c mesalib/src/mesa/main/texparam.c mesalib/src/mesa/program/ir_to_mesa.cpp mesalib/src/mesa/program/prog_optimize.c pixman/pixman/pixman-fast-path.c pixman/pixman/pixman-fast-path.h xorg-server/hw/xquartz/GL/indirect.c xorg-server/hw/xquartz/X11Application.h xorg-server/hw/xquartz/X11Application.m xorg-server/hw/xquartz/bundle/Resources/French.lproj/locversion.plist xorg-server/hw/xquartz/bundle/Resources/French.lproj/main.nib/designable.nib xorg-server/hw/xquartz/bundle/Resources/German.lproj/locversion.plist xorg-server/hw/xquartz/bundle/Resources/German.lproj/main.nib/designable.nib xorg-server/hw/xquartz/bundle/Resources/Japanese.lproj/locversion.plist xorg-server/hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/designable.nib xorg-server/hw/xquartz/darwinEvents.c xorg-server/hw/xquartz/darwinEvents.h xorg-server/hw/xquartz/man/Xquartz.man xorg-server/hw/xquartz/xpr/dri.c xorg-server/xkeyboard-config/symbols/ee
| * libX11 libXext mesa pixman xserver xkeyboard-config git update 26 July 2011marha2011-07-261-27/+178
| |
* | svn merge ^/branches/released .marha2011-03-101-0/+19
|\|
| * xserver mesa git update 10 Mar 2011marha2011-03-101-0/+19
| |
* | svn merge ^/branches/released .marha2011-02-281-0/+20
|\|
| * xserver libX11 Xextproto mesa Git update 28 Feb 2011marha2011-02-281-249/+269
|/
* xserver mesa libX11 xkbcomp pixman git update 8/1/2011marha2011-01-081-0/+2
|
* xserver and mesa git update 28-12-2010marha2010-12-281-247/+247
|
* Updated to mesalib 7.9marha2010-11-221-1/+18
|
* Updated to following packages:marha2010-04-021-3/+0
| | | | | mesa-7.8
* Updated to Mesa 7.7marha2010-03-071-227/+48
|
* Updated to mesa_7_6_1_rc1marha2009-12-221-0/+50
|
* Added MesaLib-7.6marha2009-10-081-0/+362