[FFmpeg-cvslog] [FFmpeg/FFmpeg] 3e1606: cmdutils: update copyright year to 2015.

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/FFmpeg/FFmpeg
  Commit: 3e160652219ff4da433f5672ae1e5f4956abb815
      https://github.com/FFmpeg/FFmpeg/commit/3e160652219ff4da433f5672ae1e5f4956abb815
  Author: Johan Andersson <j at i19.se>
  Date:   2015-01-04 (Sun, 04 Jan 2015)

  Changed paths:
    M cmdutils.c

  Log Message:
  -----------
  cmdutils: update copyright year to 2015.

Signed-off-by: Martin Storsjö <martin at martin.st>


  Commit: 1d41571bbf0dc1624f8e3b667e9225d43b04019c
      https://github.com/FFmpeg/FFmpeg/commit/1d41571bbf0dc1624f8e3b667e9225d43b04019c
  Author: Michael Niedermayer <michaelni at gmx.at>
  Date:   2015-01-05 (Mon, 05 Jan 2015)

  Log Message:
  -----------
  Merge commit '3e160652219ff4da433f5672ae1e5f4956abb815'

* commit '3e160652219ff4da433f5672ae1e5f4956abb815':
  cmdutils: update copyright year to 2015.

Conflicts:
	cmdutils.c

See: b8db25a3338b67186837c49580fe538d63dd73c7
Merged-by: Michael Niedermayer <michaelni at gmx.at>


Compare: https://github.com/FFmpeg/FFmpeg/compare/f1098eb97d3c...1d41571bbf0d