Conflicts:
configure.ac
src/driver/pictureviewer/pictureviewer.cpp
src/gui/bouquetlist.cpp
src/gui/osd_setup.cpp
src/neutrino.cpp
src/system/flashtool.cpp
src/system/settings.h
Signed-off-by: Thilo Graf <dbt@novatux.de>
mostly format and line and build fixes