Sascha Hauer cd323c0224 Merge branch 'for-next/png' ... Conflicts: common/filetype.c include/filetype.h		2012-10-03 21:12:19 +02:00
..
bin	bmp: rename it to splash	2012-09-12 17:16:45 +02:00
config	defaultenv: switch hostname to global.hostname	2012-10-02 08:57:07 +02:00