diff options
| author | marha <marha@users.sourceforge.net> | 2013-09-23 09:49:27 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-09-23 09:49:27 +0200 |
| commit | b299d73bb416e2a26a642a54d5a15ea9fa30df33 (patch) | |
| tree | 4cff827d4348e99d516ee2f1051f92ad5fa3ef8d /xorg-server/os/io.c | |
| parent | a5179a42a3376f0d8c1d01456235b044854d8bdc (diff) | |
| parent | e4d5a2996e4a03f55bc7d21c493ba1bcbef35aae (diff) | |
| download | vcxsrv-b299d73bb416e2a26a642a54d5a15ea9fa30df33.tar.gz vcxsrv-b299d73bb416e2a26a642a54d5a15ea9fa30df33.tar.bz2 vcxsrv-b299d73bb416e2a26a642a54d5a15ea9fa30df33.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa xserver git update 23 Sep 2013
Conflicts:
mesalib/src/glsl/ast.h
mesalib/src/glsl/glsl_parser_extras.h
mesalib/src/glsl/glsl_symbol_table.cpp
mesalib/src/glsl/ir_constant_expression.cpp
mesalib/src/glsl/list.h
Diffstat (limited to 'xorg-server/os/io.c')
0 files changed, 0 insertions, 0 deletions