Merge commit '10db1a9bca46b0f760a1263d47142b2f57e195d7'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Jul 2013 08:42:40 +0000 (10:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Jul 2013 08:42:40 +0000 (10:42 +0200)
commit93b3a5edffa30db752b9780f4c30ccfbe849afce
treeec5455059f693c35f29688b4070ee1dbb65c3ad5
parent4cf6e0008187cf75ac86f3bd12592b5f6ac9d91e
parent10db1a9bca46b0f760a1263d47142b2f57e195d7
Merge commit '10db1a9bca46b0f760a1263d47142b2f57e195d7'

* commit '10db1a9bca46b0f760a1263d47142b2f57e195d7':
  avutil/tree: K&R formatting cosmetics

Conflicts:
libavutil/tree.c

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