diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-11 10:09:13 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-11 10:09:13 +0200 |
| commit | 30c05ead4fe1b6a341d5b585e3a6b5d255edf650 (patch) | |
| tree | 932b22aede860e3ab2efe50116ad776f81c04606 /apps | |
| parent | ac799961eb382e48c68ffda1e1a89b346eb97f81 (diff) | |
| parent | 8223fb176264123c86c0d3eb845973d00fd62cc2 (diff) | |
| download | vcxsrv-30c05ead4fe1b6a341d5b585e3a6b5d255edf650.tar.gz vcxsrv-30c05ead4fe1b6a341d5b585e3a6b5d255edf650.tar.bz2 vcxsrv-30c05ead4fe1b6a341d5b585e3a6b5d255edf650.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xwininfo mesa git update 11 oct 2012
Conflicts:
mesalib/src/mapi/glapi/gen/glX_proto_recv.py
mesalib/src/mapi/glapi/gen/glX_proto_size.py
mesalib/src/mapi/glapi/gen/glX_server_table.py
mesalib/src/mapi/glapi/gen/gl_table.py
mesalib/src/mesa/main/.gitignore
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/xwininfo/xwininfo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/xwininfo/xwininfo.c b/apps/xwininfo/xwininfo.c index 3af82d84c..de1e33e4c 100644 --- a/apps/xwininfo/xwininfo.c +++ b/apps/xwininfo/xwininfo.c @@ -992,7 +992,7 @@ Display_Stats_Info (struct wininfo *w) visual_iter = xcb_depth_visuals_iterator (depth_iter.data); for (; visual_iter.rem; xcb_visualtype_next (&visual_iter)) { - if (screen->root_visual == visual_iter.data->visual_id) { + if (win_attributes->visual == visual_iter.data->visual_id) { visual_type = visual_iter.data; break; } |