diff options
| author | wm4 <wm4@nowhere> | 2012-10-24 22:38:45 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-10-24 22:38:45 +0200 |
| commit | 0e81d62c53a205ce5a4a5b201c283a1f9aba7316 (patch) | |
| tree | 9ce8f4b0444a765c6a5dce3cb84c528a0e4ca3df /osdep | |
| parent | bcf447d7e82af814ccc07c852543be38e58d69c8 (diff) | |
| parent | 60cbc9461b86b13c68cc9537bc9a124ddc07a399 (diff) | |
| download | mpv-0e81d62c53a205ce5a4a5b201c283a1f9aba7316.tar.bz2 mpv-0e81d62c53a205ce5a4a5b201c283a1f9aba7316.tar.xz | |
Merge branch 'master' into osd_changes
Conflicts:
libvo/vo_xv.c
Diffstat (limited to 'osdep')
| -rw-r--r-- | osdep/mpv.exe.manifest (renamed from osdep/mplayer.exe.manifest) | 0 | ||||
| -rw-r--r-- | osdep/mpv.rc (renamed from osdep/mplayer.rc) | 0 |
2 files changed, 0 insertions, 0 deletions
diff --git a/osdep/mplayer.exe.manifest b/osdep/mpv.exe.manifest index c924377c4b..c924377c4b 100644 --- a/osdep/mplayer.exe.manifest +++ b/osdep/mpv.exe.manifest diff --git a/osdep/mplayer.rc b/osdep/mpv.rc index ec04346f9d..ec04346f9d 100644 --- a/osdep/mplayer.rc +++ b/osdep/mpv.rc |