diff options
| author | wm4 <wm4@mplayer2.org> | 2012-02-19 17:34:28 +0100 |
|---|---|---|
| committer | wm4 <wm4@mplayer2.org> | 2012-02-19 17:34:28 +0100 |
| commit | 9371753dc475b4a541875c8cae16f0cbceddcd50 (patch) | |
| tree | cd833d0b1810735892518b64a4144d3682bddcf8 | |
| parent | 912e268931c5f1529c620a77f23f5c5709d32e29 (diff) | |
| parent | 637d6b7c8e12b4f71ccbc64f73a402b573e71697 (diff) | |
| download | mpv-9371753dc475b4a541875c8cae16f0cbceddcd50.tar.bz2 mpv-9371753dc475b4a541875c8cae16f0cbceddcd50.tar.xz | |
Merge remote-tracking branch 'origin/master' into my_master
| -rw-r--r-- | osdep/mplayer.rc | 2 | ||||
| -rwxr-xr-x | version.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/osdep/mplayer.rc b/osdep/mplayer.rc index 1955b72779..fe68aa2175 100644 --- a/osdep/mplayer.rc +++ b/osdep/mplayer.rc @@ -35,7 +35,7 @@ FILETYPE VFT_APP VALUE "CompanyName", "\000" VALUE "FileDescription", "mplayer2 - Movie Player\000" VALUE "FileVersion",VERSION - VALUE "LegalCopyright", " (C) 2000-2011 MPlayer Team\000" + VALUE "LegalCopyright", " (C) 2000-2012 MPlayer Team\000" //VALUE "LegalTrademarks"," \000"; VALUE "OriginalFilename", "mplayer.exe\000" VALUE "ProductName", "mplayer2 - The Movie Player\000" diff --git a/version.sh b/version.sh index aaf6c1cfaa..6f3be92639 100755 --- a/version.sh +++ b/version.sh @@ -15,7 +15,7 @@ test $version || version=$git_revision NEW_REVISION="#define VERSION \"${version}${extra}\"" OLD_REVISION=$(head -n 1 version.h 2> /dev/null) -TITLE='#define MP_TITLE "%s "VERSION" (C) 2000-2011 MPlayer Team\n"' +TITLE='#define MP_TITLE "%s "VERSION" (C) 2000-2012 MPlayer Team\n"' # Update version.h only on revision changes to avoid spurious rebuilds if test "$NEW_REVISION" != "$OLD_REVISION"; then |