Merge commit '8747fce91fca6bb8e9936497f2de05c905cf43b5'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Aug 2013 10:01:22 +0000 (12:01 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Aug 2013 10:01:22 +0000 (12:01 +0200)
commita87cf3689ef2a1a53a022d664f3687d506ab08b1
treeb81ce88a8383bc538a1fb33627c9ee1a4bf790fd
parent15677e72399d12911128e7109a7e4101226f48d6
parent8747fce91fca6bb8e9936497f2de05c905cf43b5
Merge commit '8747fce91fca6bb8e9936497f2de05c905cf43b5'

* commit '8747fce91fca6bb8e9936497f2de05c905cf43b5':
  electronicarts: K&R formatting cosmetics

Conflicts:
libavformat/electronicarts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/electronicarts.c