diff options
author | Michael Niedermayer <[email protected]> | 2013-06-13 09:50:42 +0200 |
---|---|---|
committer | Michael Niedermayer <[email protected]> | 2013-06-13 09:50:42 +0200 |
commit | 90c8863a749432608b05d2b7d93475e8ebd62bbb (patch) | |
tree | 76687aa0cbcd6445654198a5128a37ac91fa7091 /doc/examples | |
parent | 5c3e5651dd88af5da86ef08f01e865bfdea36a3a (diff) | |
parent | e6496ea7e7ea7355167a1ccbe67a7199d446a654 (diff) |
Merge commit 'e6496ea7e7ea7355167a1ccbe67a7199d446a654'
* commit 'e6496ea7e7ea7355167a1ccbe67a7199d446a654':
4xm: K&R formatting cosmetics
Conflicts:
libavformat/4xm.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'doc/examples')
0 files changed, 0 insertions, 0 deletions