diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-12-30 00:53:08 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-12-30 00:56:10 +0200 |
commit | d46b86bc7c39082b26ec71aa16431f3275d836ff (patch) | |
tree | 035da87ed658f7d75c0eba5a5d4de5462a4c8ddd /libvo/x11_common.c | |
parent | a06b32b64e91082c11f747e2910f10a4afd3dfa9 (diff) | |
parent | 3e8f2815c19703f5cb6f75db2910234d499d9676 (diff) | |
download | mpv-d46b86bc7c39082b26ec71aa16431f3275d836ff.tar.bz2 mpv-d46b86bc7c39082b26ec71aa16431f3275d836ff.tar.xz |
Merge svn changes up to r30136
Ignore another broken correct-pts change in 30134.
Diffstat (limited to 'libvo/x11_common.c')
-rw-r--r-- | libvo/x11_common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libvo/x11_common.c b/libvo/x11_common.c index ea1f53971a..b6ab203a6a 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -707,7 +707,7 @@ void vo_x11_decoration(struct vo *vo, int d) } } -void vo_x11_classhint(struct vo *vo, Window window, char *name) +void vo_x11_classhint(struct vo *vo, Window window, const char *name) { struct vo_x11_state *x11 = vo->x11; XClassHint wmClass; |