* commit '46ce9ded96ffcb798b03da894cdb5fdac376a6ee': tiff: K&R formatting cosmetics Conflicts: libavcodec/tiff.c libavcodec/tiff.h libavcodec/tiffenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at> |
12 years ago | |
|---|---|---|
| .. | ||
| snprintf.c | Merge commit '46ce9ded96ffcb798b03da894cdb5fdac376a6ee' | 12 years ago |
| snprintf.h | Merge commit '46ce9ded96ffcb798b03da894cdb5fdac376a6ee' | 12 years ago |