Merge remote branch 'upstream/master'

Conflicts:
	src/exif.c

1 files changed, 1 insertions, 0 deletions

diff --git a/src/feh.h b/src/feh.h
index 6719963..996de84 100644
--- a/src/feh.h
+++ b/src/feh.h
@@ -137,6 +137,7 @@ void init_keyevents(void);
 void init_buttonbindings(void);
 void feh_event_handle_keypress(XEvent * ev);
 void feh_action_run(feh_file * file, char *action);
+char *format_size(int size);
 char *feh_printf(char *str, feh_file * file);
 void im_weprintf(winwidget w, char *fmt, ...);
 void feh_draw_zoom(winwidget w);