diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-03 21:12:19 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-03 21:12:19 +0200 |
| commit | cd323c02240af01eb914c87d9d7c41db6e34984b (patch) | |
| tree | f040bcd063d5de45d287ea93a08dda46c848a70e /include/filetype.h | |
| parent | 6a6402414852d994ce67f5df1eb7ff6e827d531b (diff) | |
| parent | f65c991d410bc5e04cf0798618f94a0627f33057 (diff) | |
| download | barebox-cd323c02240af01eb914c87d9d7c41db6e34984b.tar.gz barebox-cd323c02240af01eb914c87d9d7c41db6e34984b.tar.xz | |
Merge branch 'for-next/png'
Conflicts:
common/filetype.c
include/filetype.h
Diffstat (limited to 'include/filetype.h')
| -rw-r--r-- | include/filetype.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/filetype.h b/include/filetype.h index 209dc11a3d..0b6cd24a6d 100644 --- a/include/filetype.h +++ b/include/filetype.h @@ -20,6 +20,8 @@ enum filetype { filetype_mips_barebox, filetype_fat, filetype_mbr, + filetype_bmp, + filetype_png, }; const char *file_type_to_string(enum filetype f); |