Merge branch 'master'

diff --git a/cache.h b/cache.h
index 08461cfc5a71b8c43f4774de0da897ed2aa3e6ad..99afa2c3c49b56c7c807dd692cb7a83f8f00ade0 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -259,6 +259,7 @@ extern void *read_object_with_reference(const unsigned char *sha1,
 const char *show_date(unsigned long time, int timezone);
 int parse_date(const char *date, char *buf, int bufsize);
 void datestamp(char *buf, int bufsize);
+unsigned long approxidate(const char *);
 
 extern int setup_ident(void);
 extern char *get_ident(const char *name, const char *email, const char *date_str);