]> git.donarmstrong.com Git - lilypond.git/commit - lily/paper-column.cc
projects / lilypond.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3d681df) | patch
lily/paper-column.cc, prevent conflict on further merge
authorFrancisco Vila <francisco.vila@hispalinux.es>
Tue, 9 Jun 2009 09:03:26 +0000 (11:03 +0200)
committerFrancisco Vila <francisco.vila@hispalinux.es>
Tue, 9 Jun 2009 09:03:26 +0000 (11:03 +0200)
commit741b1bcfd22532d701989925ad22f4b590506777
treeb1a3fb744d8bfff851557626bcadb588be8c5726tree | snapshot
parent3d681df96a6afb8f0df76aa5967326c2fd3c20dacommit | diff
lily/paper-column.cc, prevent conflict on further merge

Ease merging of master into lilypond/translation, by parts.
lily/paper-column.cc diff | blob | history
Debian packaging of lilypond