summaryrefslogtreecommitdiff
path: root/submodule.h
diff options
context:
space:
mode:
authorJiang Xin <worldhello.net@gmail.com>2012-04-28 20:30:50 +0800
committerJiang Xin <worldhello.net@gmail.com>2012-04-28 20:30:50 +0800
commitb240ea25a97d1b96acc4d0f5ae0dbcbe9e0af860 (patch)
treeda951e1c145cc094a6e5d634141f03b809bf3aff /submodule.h
parent01b127cdc5d596a3022d834d82f883822c7f166b (diff)
parent868d662399786462f87df45c3d68bd5390311a6e (diff)
Merge maint branch for tracking l10n updates of git stable version
Use master branch to track l10n updates for git next release, while use maint branch to track l10n updates for git stable version.
Diffstat (limited to 'submodule.h')
-rw-r--r--submodule.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/submodule.h b/submodule.h
index 80e04f3c8c..9c5e5c0c30 100644
--- a/submodule.h
+++ b/submodule.h
@@ -13,7 +13,7 @@ enum {
void set_diffopt_flags_from_submodule_config(struct diff_options *diffopt,
const char *path);
int submodule_config(const char *var, const char *value, void *cb);
-void gitmodules_config();
+void gitmodules_config(void);
int parse_submodule_config_option(const char *var, const char *value);
void handle_ignore_submodules_arg(struct diff_options *diffopt, const char *);
int parse_fetch_recurse_submodules_arg(const char *opt, const char *arg);