summaryrefslogtreecommitdiffstats
path: root/src/util.h
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2003-05-28 12:47:44 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2003-05-28 12:47:44 (GMT)
commit70b82eced91d2739181f2b700ec04cb14d776d7b (patch)
tree3e4e50e4fa9b9f0f4c75870e0a09ffc488b34699 /src/util.h
parentecdf7c392922b84a6a1803270104a448e2723c86 (diff)
downloadDoxygen-70b82eced91d2739181f2b700ec04cb14d776d7b.zip
Doxygen-70b82eced91d2739181f2b700ec04cb14d776d7b.tar.gz
Doxygen-70b82eced91d2739181f2b700ec04cb14d776d7b.tar.bz2
Release-1.3.1
Diffstat (limited to 'src/util.h')
-rw-r--r--src/util.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/util.h b/src/util.h
index eac09ae..f8f1c58 100644
--- a/src/util.h
+++ b/src/util.h
@@ -122,7 +122,7 @@ bool matchArguments(ArgumentList *,ArgumentList *,
const char *cl=0,const char *ns=0,bool checkCV=TRUE,
NamespaceList *usingNamespaces=0,
ClassList *usingClasses=0);
-void mergeArguments(ArgumentList *,ArgumentList *);
+void mergeArguments(ArgumentList *,ArgumentList *,bool forceNameOverwrite=FALSE);
QCString substituteClassNames(const QCString &s);
QCString substitute(const char *s,const char *src,const char *dst);
QCString resolveDefines(const char *n);