diff options
| author | wm4 <wm4@mplayer2.org> | 2012-04-28 00:39:19 +0200 |
|---|---|---|
| committer | wm4 <wm4@mplayer2.org> | 2012-04-28 00:54:26 +0200 |
| commit | 87f4cafe9c0881743d1117c2e8cd7e3376e33302 (patch) | |
| tree | f41caa5aad8969d769a777c0a7912751721a66bd /Makefile | |
| parent | 1324eaece08d84fbe3eb539642dba99b74dd1c07 (diff) | |
| parent | b711624ef350d1e971f5fcc57eb4af9f74233d2a (diff) | |
| download | mpv-87f4cafe9c0881743d1117c2e8cd7e3376e33302.tar.bz2 mpv-87f4cafe9c0881743d1117c2e8cd7e3376e33302.tar.xz | |
Merge remote-tracking branch 'origin/master'
Conflicts:
command.c
libao2/ao_alsa.c
libao2/ao_dsound.c
libao2/ao_pulse.c
libao2/audio_out.h
mixer.c
mixer.h
mplayer.c
Replace my mixer changes with uau's implementation, which is based on
my code.
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions