]> git.donarmstrong.com Git - lilypond.git/commit
Merge branch 'master' of ssh+git://git.sv.gnu.org/srv/git/lilypond
authorWerner Lemberg <wl@gnu.org>
Sun, 7 Jan 2007 21:38:22 +0000 (22:38 +0100)
committerWerner Lemberg <wl@gnu.org>
Sun, 7 Jan 2007 21:38:22 +0000 (22:38 +0100)
commitfff60a761b1e447aa316ab55e64bf8c419e69950
tree63a5dadc4ebe0092f1051b3620db57df85f2904d
parentd40224c98a074a12e19708300a5a84119f567b22
parent8f747ff7c500616fdb45079fdad47fc6325ce6e3
Merge branch 'master' of ssh+git://git.sv.gnu.org/srv/git/lilypond

Conflicts:

Documentation/user/introduction.itely
Documentation/user/scheme-tutorial.itely
17 files changed:
Documentation/user/advanced-notation.itely
Documentation/user/basic-notation.itely
Documentation/user/changing-defaults.itely
Documentation/user/converters.itely
Documentation/user/instrument-notation.itely
Documentation/user/introduction.itely
Documentation/user/lilypond-book.itely
Documentation/user/non-music.itely
Documentation/user/notation-appendices.itely
Documentation/user/programming-interface.itely
Documentation/user/putting.itely
Documentation/user/running.itely
Documentation/user/scheme-tutorial.itely
Documentation/user/spacing.itely
Documentation/user/tutorial.itely
Documentation/user/tweaks.itely
Documentation/user/working.itely