merge with master

2013-05-08 14:48:28 -04:00
parent e1b0f1bd0b cadfc2aee1
commit bebe2af95a
36 changed files with 563 additions and 318 deletions
--- a/11
+++ b/11
@@ -7,16 +7,7 @@ import string
 import subprocess
 import sys

-#
-# build scripts need to find the right platform specific version
-# 
-
-if sys.platform == 'darwin':
-    OSX_VERSION = '3.0beta6'
-    VERSION = '3.0beta6'
-else:
-    LINUX_VERSION = '3.1'
-    VERSION = '3.1'
+VERSION = '3.1'

 APPNAME = 'Ardour3'