diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-09-20 16:13:33 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-09-20 16:13:33 +0300 |
| commit | 849dc0ba31f209dfdb48146512e48ee2203d0ee6 (patch) | |
| tree | 27b3fcc37410ea5f646eb5fc2411406f2cdee175 /libvo/x11_common.h | |
| parent | 259ea9d7034566760785fd5253f97b65ee8cd6ed (diff) | |
| parent | 7756839a147ce2421cfb4e3de046364962094b60 (diff) | |
| download | mpv-849dc0ba31f209dfdb48146512e48ee2203d0ee6.tar.bz2 mpv-849dc0ba31f209dfdb48146512e48ee2203d0ee6.tar.xz | |
Merge svn changes up to r27649
Conflicts:
Makefile
configure
libvo/x11_common.c
Diffstat (limited to 'libvo/x11_common.h')
| -rw-r--r-- | libvo/x11_common.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libvo/x11_common.h b/libvo/x11_common.h index cdced1ebdd..b3066b300a 100644 --- a/libvo/x11_common.h +++ b/libvo/x11_common.h @@ -54,7 +54,6 @@ struct vo_x11_state { Atom XA_WIN_PROTOCOLS; Atom XA_WIN_LAYER; Atom XA_WIN_HINTS; - Atom XA_BLACKBOX_PID; Atom XAWM_PROTOCOLS; Atom XAWM_DELETE_WINDOW; }; |