From 8b20ee98d236542ac5f6ef39391b134b8abe00a3 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: May 23 2012 13:40:10 +0000 Subject: Merge branch 'master' into f17 --- diff --git a/.gitignore b/.gitignore index 885a423..bda9d8d 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ lilypond-2.12.3.tar.gz /lilypond-2.15.36.tar.gz /lilypond-2.15.37.tar.gz /lilypond-2.15.38.tar.gz +/lilypond-2.15.39.tar.gz diff --git a/lilypond.spec b/lilypond.spec index 854a621..2f30596 100644 --- a/lilypond.spec +++ b/lilypond.spec @@ -1,6 +1,6 @@ Name: lilypond -Version: 2.15.38 -Release: 2%{?dist} +Version: 2.15.39 +Release: 1%{?dist} Summary: A typesetting system for music notation Group: Applications/Publishing @@ -149,6 +149,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed May 23 2012 Jon Ciesla - 2.15.39-1 +- RC. + * Fri May 11 2012 Jon Ciesla - 2.15.38-2 - Patch for gcc bug, BZ 820998. diff --git a/sources b/sources index 7bb2c6f..cabd679 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2a66079c8c7ca4887fe3510524028929 lilypond-2.15.38.tar.gz +8852ec8111cf983d6a68122f1a757d14 lilypond-2.15.39.tar.gz