summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGraham Percival <graham@percival-music.ca>2011-05-01 20:11:17 +0100
committerGraham Percival <graham@percival-music.ca>2011-05-01 20:11:17 +0100
commit5a93bad120bf8f444e60fbd89bef0a8d474fb026 (patch)
tree63cba22d69df7a4e63a94c4e78fd07f5a7b4cd15
parentfcb0aee9eb78df1741a3d705c901b557e88bf972 (diff)
git master is now 2.15.0.
-rw-r--r--VERSION4
-rw-r--r--input/regression/autobeam-nobeam.ly4
-rw-r--r--input/regression/glissando-chord-linebreak.ly4
-rw-r--r--input/regression/glissando-chord.ly4
-rw-r--r--input/regression/glissando-consecutive.ly4
-rw-r--r--input/regression/glissando-index.ly4
-rw-r--r--ly/predefined-mandolin-fretboards.ly2
7 files changed, 8 insertions, 18 deletions
diff --git a/VERSION b/VERSION
index cfed26e0ef..939c83f285 100644
--- a/VERSION
+++ b/VERSION
@@ -1,7 +1,7 @@
PACKAGE_NAME=LilyPond
MAJOR_VERSION=2
-MINOR_VERSION=13
-PATCH_LEVEL=62
+MINOR_VERSION=15
+PATCH_LEVEL=0
MY_PATCH_LEVEL=
VERSION_STABLE=2.12.3
VERSION_DEVEL=2.13.61
diff --git a/input/regression/autobeam-nobeam.ly b/input/regression/autobeam-nobeam.ly
index 6273ec375e..233587523e 100644
--- a/input/regression/autobeam-nobeam.ly
+++ b/input/regression/autobeam-nobeam.ly
@@ -1,6 +1,4 @@
-\version "2.13.61"
-%% Hack -- this should be 2.15.0, unless it is backported
-%% Set to 2.13.61 in order to keep compile working
+\version "2.15.0"
\header {
diff --git a/input/regression/glissando-chord-linebreak.ly b/input/regression/glissando-chord-linebreak.ly
index d33e464e71..bcdb0b2938 100644
--- a/input/regression/glissando-chord-linebreak.ly
+++ b/input/regression/glissando-chord-linebreak.ly
@@ -1,6 +1,4 @@
-\version "2.13.61"
-%% This should really be 2.15.0, because the glissando code
-%% hasn't been backported -- this is a git-only test at this point
+\version "2.15.0"
\header {
diff --git a/input/regression/glissando-chord.ly b/input/regression/glissando-chord.ly
index d44ea76320..27ae104037 100644
--- a/input/regression/glissando-chord.ly
+++ b/input/regression/glissando-chord.ly
@@ -1,6 +1,4 @@
-% FIXME: this is a fake version number to allow git master
-% to compile. See discussion on lilypond-devel.
-\version "2.13.61"
+\version "2.15.0"
\header {
texidoc = "LilyPond typesets glissandi between chords."
diff --git a/input/regression/glissando-consecutive.ly b/input/regression/glissando-consecutive.ly
index 62c4085789..cfcb8de6c3 100644
--- a/input/regression/glissando-consecutive.ly
+++ b/input/regression/glissando-consecutive.ly
@@ -1,6 +1,4 @@
-\version "2.13.61"
-%% This should really be 2.15.0, because the glissando code
-%% hasn't been backported -- this is a git-only test at this point
+\version "2.15.0"
\header {
diff --git a/input/regression/glissando-index.ly b/input/regression/glissando-index.ly
index 9b2d99cd11..bae744123f 100644
--- a/input/regression/glissando-index.ly
+++ b/input/regression/glissando-index.ly
@@ -1,6 +1,4 @@
-% FIXME: this is a fake version number to allow git master
-% to compile. See discussion on lilypond-devel.
-\version "2.13.61"
+\version "2.15.0"
\header {
texidoc = "Individual glissandi within a chord can be tweaked."
diff --git a/ly/predefined-mandolin-fretboards.ly b/ly/predefined-mandolin-fretboards.ly
index 08525cf1ed..35c0ccdf7f 100644
--- a/ly/predefined-mandolin-fretboards.ly
+++ b/ly/predefined-mandolin-fretboards.ly
@@ -15,7 +15,7 @@
%%%% You should have received a copy of the GNU General Public License
%%%% along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
-\version "2.13.61"
+\version "2.15.0"
%%%% sources:
%%%% mandolincafe website (http://www.mandolincafe.com/),