Merge commit '38129c26c51b933d7db423f904ba0cd6a88ca1ed'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 03:30:25 +0000 (04:30 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 03:31:17 +0000 (04:31 +0100)
commit934f2d2f5c16df8aad9f401a9fd842b5d9a78b11
tree63136014c46c98a9de8cb93c6916c7c9cfb7b5a3
parentff4f2036defbadc60081ba252e093abda5897d6d
parent38129c26c51b933d7db423f904ba0cd6a88ca1ed
Merge commit '38129c26c51b933d7db423f904ba0cd6a88ca1ed'

* commit '38129c26c51b933d7db423f904ba0cd6a88ca1ed':
  cmdutils: check file access functions return values

Conflicts:
cmdutils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
cmdutils.c