Commit c375fe1a authored by Dimitri van Heesch's avatar Dimitri van Heesch
Browse files

Merge branch 'master' of github.com:doxygen/doxygen

parents f2935bef fac9a7ce

src/doxygen.cpp

+1 −1
Original line number Diff line number Diff line
@@ -9780,7 +9780,7 @@ static void usage(const char *name) 
  msg("    RTF:        %s -w rtf styleSheetFile\n",name);

  msg("    HTML:       %s -w html headerFile footerFile styleSheetFile [configFile]\n",name);

  msg("    LaTeX:      %s -w latex headerFile footerFile styleSheetFile [configFile]\n\n",name);

  msg("6) Use doxygen to generate an rtf extensions file\n");

  msg("6) Use doxygen to generate a rtf extensions file\n");

  msg("    RTF:   %s -e rtf extensionsFile\n\n",name);

  msg("If -s is specified the comments of the configuration items in the config file will be omitted.\n");

  msg("If configName is omitted `Doxyfile' will be used as a default.\n\n");

src/fortranscanner.l

+1 −1
Original line number Diff line number Diff line
@@ -1998,7 +1998,7 @@ static void addSubprogram(const char *text) 
  subrCurrent.prepend(current);

  current->section = Entry::FUNCTION_SEC ;

  QCString subtype = text; subtype=subtype.lower().stripWhiteSpace();

  functionLine = subtype=="function";

  functionLine = (subtype.find("function") != -1);

  current->type += " " + subtype;

  current->type = current->type.stripWhiteSpace();

  current->fileName  = yyFileName;