ffmpeg | branch: release/2.2 | Michael Niedermayer <[email protected]> | Mon Jul 28 02:22:11 2014 +0200| [f543d32455a30c7e11206241184dfb16b8a8081c] | 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 <[email protected]> (cherry picked from commit 2f71aeb30161edb5cb0fea5d3080094a22cc3038) Conflicts: VERSION > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f543d32455a30c7e11206241184dfb16b8a8081c --- VERSION | 1 - 1 file changed, 1 deletion(-) diff --git a/VERSION b/VERSION deleted file mode 100644 index bda8fbe..0000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -2.2.6 _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
