Merge the 1.5.2 changes from trunk.

[SVN r62830]
2026-01-26 18:52:26 +00:00 · 2010-06-12 08:29:53 +00:00
parent f50dee9a1c
commit e529faf7ba
62 changed files with 1569 additions and 612 deletions
--- a/code_snippet_grammar.cpp
+++ b/code_snippet_grammar.cpp
@@ -36,8 +36,6 @@ namespace quickbook
            code_elements;
        qi::rule<iterator, std::string()>
            identifier;
-        qi::rule<iterator, quickbook::callout()>
-            inline_callout, line_callout;
        qi::rule<iterator, quickbook::escaped_comment()>
            escaped_comment;
    };