]> git.donarmstrong.com Git - lilypond.git/commit
Merge branch 'stable/2.16' into staging
authorJohn Mandereau <john.mandereau@gmail.com>
Fri, 24 Aug 2012 13:28:03 +0000 (15:28 +0200)
committerJohn Mandereau <john.mandereau@gmail.com>
Fri, 24 Aug 2012 13:31:30 +0000 (15:31 +0200)
commit5b1f3adfe5e3561eaa0f9440e0697054084b7107
treec63347a35928cb71042f320f0a9f59163d85f1e4
parent6f4918cf29edf603cc5da0775cea3d9697cff4ee
parent0fef477419a8872759bfed4c1cf8e66f68db1104
Merge branch 'stable/2.16' into staging

Conflicts:
VERSION
input/regression/ambitus-with-ligature.ly
input/regression/empty-chord.ly
python/convertrules.py
THANKS
13 files changed:
Documentation/notation/pitches.itely
Documentation/notation/rhythms.itely
Documentation/notation/simultaneous.itely
Documentation/notation/spacing.itely
THANKS
VERSION
input/regression/context-mod-with.ly
input/regression/hairpin-barline-break.ly
input/regression/markup-user.ly
input/regression/relative-repeat.ly
ly/paper-defaults-init.ly
ly/titling-init.ly
python/convertrules.py