]> git.donarmstrong.com Git - lilypond.git/commit - make/doc-i18n-root-vars.make
Merge commit 'origin/master'
authorJohn Mandereau <john.mandereau@gmail.com>
Thu, 20 Aug 2009 09:56:59 +0000 (11:56 +0200)
committerJohn Mandereau <john.mandereau@gmail.com>
Thu, 20 Aug 2009 09:56:59 +0000 (11:56 +0200)
commit1efdabf3b2349ea7fa3183dca5bba5104c347c36
tree1f6c8c286b3cc2b08410ca1731cc1554759fa82b
parent2c6ac487aecd51dfa81449ac99a08e619e8d3bf8
parent026aee63bcd80eadb3ad08b3177b1e7cbd40d056
Merge commit 'origin/master'

Conflicts:
Documentation/ja/learning/introduction.itely
Documentation/ja/learning/introduction.itely