OSDN Git Service

Merge commit '93d216d37a3f95190ecb9d51cf72f54ea4e04ec7'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 7 Mar 2014 11:44:09 +0000 (12:44 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 7 Mar 2014 11:44:09 +0000 (12:44 +0100)
commit774d0c9dbaf580df1570fb46caf5917e20ca5193
treeff33a07157c77c218586155ab32ef5147aa73d78
parent64e4bd7414fc05745e1a723b4da0a44fe7b0558b
parent93d216d37a3f95190ecb9d51cf72f54ea4e04ec7
Merge commit '93d216d37a3f95190ecb9d51cf72f54ea4e04ec7'

* commit '93d216d37a3f95190ecb9d51cf72f54ea4e04ec7':
  dict: K&R formatting cosmetics

Conflicts:
libavutil/dict.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/dict.c