From: Han-Wen Nienhuys Date: Fri, 3 Nov 2006 01:47:13 +0000 (+0100) Subject: Merge branch 'cvs-head' of http://lilypond.org/vc/lilypond into master-hanwen X-Git-Tag: release/2.10.0-2~34^2~6 X-Git-Url: https://git.donarmstrong.com/?p=lilypond.git;a=commitdiff_plain;h=b89ed23afd3df22f7160ac798ed185f42cb173b2 Merge branch 'cvs-head' of http://lilypond.org/vc/lilypond into master-hanwen Conflicts: .gitignore scm/lily.scm --- b89ed23afd3df22f7160ac798ed185f42cb173b2 diff --cc scm/lily.scm index 72e2956467,2c47415ff0..e7d6e8d0ce --- a/scm/lily.scm +++ b/scm/lily.scm @@@ -20,14 -20,14 +20,12 @@@ (anti-alias-factor 1 "render at higher resolution and scale down result\nto prevent jaggies in PNG") (check-internal-types #f "check every property assignment for types") (clip-systems #f "Generate cut-out snippets of a score") -- (debug-gc #f -- "dump memory debugging statistics") -- (debug-gc-assert-parsed-dead #f -- "for memory debugging: ensure that all refs to parsed objects are dead.") -- - (debug-parser #f "debug the bison parser") ++ (debug-gc #f "dump memory debugging statistics") ++ (debug-gc-assert-parsed-dead ++ #f "for memory debugging: ensure that all refs to parsed objects are dead.") + (debug-lexer #f "debug the flex lexer") (debug-midi #f "generate human readable MIDI") + (debug-parser #f "debug the bison parser") - (debug-lexer #f "debug the flex lexer") (delete-intermediate-files #f "delete unusable PostScript files") (dump-signatures #f "dump output signatures of each system")