diff options
| author | wm4 <wm4@mplayer2.org> | 2012-04-01 22:52:33 +0200 |
|---|---|---|
| committer | wm4 <wm4@mplayer2.org> | 2012-04-01 22:52:33 +0200 |
| commit | 1aa2e36122e6e664e42170f47d6db82873bef5aa (patch) | |
| tree | 39e13f93bcb606da9e365c7cd379132bdf53c20b /osdep/macosx_finder_args.h | |
| parent | fea8c85c8595b797fc839b113c1db252fc55c798 (diff) | |
| parent | 8cd71527ade21ea27ea24cdcc66dc71dca460f85 (diff) | |
| download | mpv-1aa2e36122e6e664e42170f47d6db82873bef5aa.tar.bz2 mpv-1aa2e36122e6e664e42170f47d6db82873bef5aa.tar.xz | |
Merge remote-tracking branch 'origin/master'
Conflicts:
bstr.c
bstr.h
etc/input.conf
input/input.c
input/input.h
libao2/ao_pulse.c
libmpcodecs/vf_ass.c
libmpcodecs/vf_vo.c
libvo/gl_common.c
libvo/x11_common.c
mixer.c
mixer.h
mplayer.c
Diffstat (limited to 'osdep/macosx_finder_args.h')
| -rw-r--r-- | osdep/macosx_finder_args.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/osdep/macosx_finder_args.h b/osdep/macosx_finder_args.h index 4f06a139a6..1f18931712 100644 --- a/osdep/macosx_finder_args.h +++ b/osdep/macosx_finder_args.h @@ -1,18 +1,18 @@ /* - * This file is part of MPlayer. + * This file is part of mplayer2. * - * MPlayer is free software; you can redistribute it and/or modify + * mplayer2 is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * MPlayer is distributed in the hope that it will be useful, + * mplayer2 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along - * with MPlayer; if not, write to the Free Software Foundation, Inc., + * with mplayer2; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ |