diff options
| author | marha <marha@users.sourceforge.net> | 2011-07-11 09:02:33 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-07-11 09:02:33 +0200 |
| commit | 4611d27b8966b26b8ac63514a461f31c3172c31c (patch) | |
| tree | 5de36cfa4517b997cb703cb1eced374c9db1f2b1 /freetype/freetypevc10.sln | |
| parent | dbe01a4f78f09723b327d1d8522bfa5026c4f6e0 (diff) | |
| parent | 0b43e0b4ddbd9fdac70658164f3dbf653067a4de (diff) | |
| download | vcxsrv-4611d27b8966b26b8ac63514a461f31c3172c31c.tar.gz vcxsrv-4611d27b8966b26b8ac63514a461f31c3172c31c.tar.bz2 vcxsrv-4611d27b8966b26b8ac63514a461f31c3172c31c.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/docs/GL3.txt
mesalib/src/glsl/linker.cpp
mesalib/src/mesa/main/depthstencil.c
mesalib/src/mesa/main/fbobject.c
mesalib/src/mesa/main/formats.c
mesalib/src/mesa/main/formats.h
mesalib/src/mesa/main/framebuffer.c
mesalib/src/mesa/main/mtypes.h
mesalib/src/mesa/main/pack.c
mesalib/src/mesa/main/readpix.c
mesalib/src/mesa/main/renderbuffer.c
mesalib/src/mesa/main/samplerobj.c
mesalib/src/mesa/main/shaderapi.c
mesalib/src/mesa/main/texenv.c
mesalib/src/mesa/main/texobj.c
mesalib/src/mesa/main/uniforms.c
mesalib/src/mesa/state_tracker/st_cb_clear.c
mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
mesalib/src/mesa/state_tracker/st_cb_readpixels.c
mesalib/src/mesa/state_tracker/st_extensions.c
mesalib/src/mesa/state_tracker/st_format.c
mesalib/src/mesa/swrast/s_readpix.c
Diffstat (limited to 'freetype/freetypevc10.sln')
0 files changed, 0 insertions, 0 deletions