diff options
author | marha <marha@users.sourceforge.net> | 2013-11-07 08:26:06 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-11-07 08:27:25 +0100 |
commit | c97d11aec40d8fa07d6b456bf8694133a77d35f4 (patch) | |
tree | 9e14e6f970a86af9f7107053c5c709e2e440d032 /mesalib/src/glsl/opt_constant_variable.cpp | |
parent | 51c3a4e7b08aa904ff2af52a9f6f7adc748b361f (diff) | |
parent | f7050e0ff2d1dd147ff5ef45f8ff7d8d7833db48 (diff) | |
download | vcxsrv-c97d11aec40d8fa07d6b456bf8694133a77d35f4.tar.gz vcxsrv-c97d11aec40d8fa07d6b456bf8694133a77d35f4.tar.bz2 vcxsrv-c97d11aec40d8fa07d6b456bf8694133a77d35f4.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
xextproto fontconfig libxcb mesa xserver git update 7 Nov 2013
Conflicts:
xorg-server/include/servermd.h
Diffstat (limited to 'mesalib/src/glsl/opt_constant_variable.cpp')
0 files changed, 0 insertions, 0 deletions