diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:47:25 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:47:25 +0200 |
commit | 90f5873f1a4b528dc245beb75b834c52ef04b3db (patch) | |
tree | 9ede9db5ad14d812f1211510b9e48ea11c915458 /loader/wine/pshpack4.h | |
parent | 15a604c405cb53054853cdc426e124936d6321d8 (diff) | |
parent | 8ba6b4eaf939f34ac34993aa225143b4102f6c02 (diff) | |
download | mpv-90f5873f1a4b528dc245beb75b834c52ef04b3db.tar.bz2 mpv-90f5873f1a4b528dc245beb75b834c52ef04b3db.tar.xz |
Merge svn changes up to r30675
Diffstat (limited to 'loader/wine/pshpack4.h')
-rw-r--r-- | loader/wine/pshpack4.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/loader/wine/pshpack4.h b/loader/wine/pshpack4.h index 7adc453cf4..1b37492232 100644 --- a/loader/wine/pshpack4.h +++ b/loader/wine/pshpack4.h @@ -12,4 +12,3 @@ #else /* MPLAYER_PSHPACK_H */ #error "Nested pushing of alignment isn't supported by the compiler" #endif /* MPLAYER_PSHPACK_H */ - |