diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-19 20:02:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-19 20:05:11 +0100 |
| commit | 8ea36711b0a85e24a77e1c76b1cb24aa63df217f (patch) | |
| tree | 5699c8de8c2139e55c188a63a0bcb6f013895c83 /Makefile | |
| parent | 43dc31f7469c873ccf3927c732a9c2d7d85360bb (diff) | |
| parent | ec10a9ab461b26b96eff7bbbb8623f42d8ee04ad (diff) | |
Merge remote-tracking branch 'newdev/master'
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Not Pulled:
commit 42cfb3835b5dad327b7dc22740e8b6e482ecfcd2
Author: Mans Rullgard <mans@mansr.com>
Date: Mon Feb 28 18:06:58 2011 +0000
Remove Sonic experimental audio codec
commit 2912e87a6c9264d556734e2bf94a99c64cf9b102
Author: Mans Rullgard <mans@mansr.com>
Date: Fri Mar 18 17:35:10 2011 +0000
Replace FFmpeg with Libav in licence headers
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -98,9 +98,8 @@ ffplay.o: CFLAGS += $(SDL_CFLAGS) VERSION_SH = $(SRC_PATH_BARE)/version.sh GIT_LOG = $(SRC_PATH_BARE)/.git/logs/HEAD -SVN_ENTRIES = $(SRC_PATH_BARE)/.svn/entries -.version: $(wildcard $(GIT_LOG) $(SVN_ENTRIES)) $(VERSION_SH) config.mak +.version: $(wildcard $(GIT_LOG)) $(VERSION_SH) config.mak .version: M=@ version.h .version: |