Merge commit '3e160652219ff4da433f5672ae1e5f4956abb815'

Browse Source

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

Conflicts:
	cmdutils.c

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

...

This commit is contained in:

Michael Niedermayer

2015-01-05 02:10:17 +01:00

parent f1098eb97d 3e16065221

commit 1d41571bbf

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available