ffmpeg | branch: release/1.1 | Michael Niedermayer <michae...@gmx.at> | Mon Jul
28 02:22:11 2014 +0200| [4ede955d864d6d8163abdf490f8af6cc49154e38] | committer:
Michael Niedermayer
remove VERSION file
it overrides what version.sh prints and thus makes its output
from release branches rather useless
Signed-off-by: Michael Niedermayer <michae...@gmx.at>
(cherry picked from commit 2f71aeb30161edb5cb0fea5d3080094a22cc3038)
Conflicts:
VERSION
(cherry picked from commit f543d32455a30c7e11206241184dfb16b8a8081c)
Conflicts:
VERSION
(cherry picked from commit 59b2a9ef957ec796ccf457aad263a52bc457b610)
Conflicts:
VERSION
Signed-off-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4ede955d864d6d8163abdf490f8af6cc49154e38
---
VERSION | 1 -
1 file changed, 1 deletion(-)
diff --git a/VERSION b/VERSION
deleted file mode 100644
index e9bc149..0000000
--- a/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-1.1.14
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
