Merge bug fixes from Trunk - see history for full details.

[SVN r58234]
This commit is contained in:
John Maddock committed 2009-12-08 12:42:33 +00:00
1 parent 95ddff1f01
commit ae79f29895
133 files changed
+1893 -933

No files matched your search

+2 -2
View File
@@ -86,8 +86,8 @@ int main(int argc, const char** argv)
return 0;
}
extern const char* pre_expression = "(<)|(>)|(&)|\\r";
extern const char* pre_format = "(?1&lt;)(?2&gt;)(?3&amp;)";
const char* pre_expression = "(<)|(>)|(&)|\\r";
const char* pre_format = "(?1&lt;)(?2&gt;)(?3&amp;)";
const char* expression_text = // preprocessor directives: index 1