Merge remote-tracking branch 'remotes/origin/master' into windows+cc

This commit is contained in:
John Emmas 2013-10-16 15:55:59 +01:00
commit 75b933eadb
13 changed files with 1861 additions and 1666 deletions

View file

@ -8,7 +8,7 @@ import subprocess
import sys
MAJOR = '3'
MINOR = '4'
MINOR = '5'
VERSION = MAJOR + '.' + MINOR
APPNAME = 'Ardour' + MAJOR