smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-03 12:19:33 +01:00
Code Issues Projects Releases Wiki Activity

fix merge conflicts with master

Browse source
This commit is contained in:
Paul Davis 2013-09-14 16:42:40 -04:00
commit 7a30e63eaa
213 changed files with 29641 additions and 21838 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/wscript
View file

@ -506,6 +506,7 @@ def build(bld):
'SMALLER' : '9',
'SMALL' : '10',
'NORMAL' : '11',
'BIG' : '13',
'BIGGER' : '17',
'LARGE' : '18',
'LARGER' : '28',
@ -531,6 +532,7 @@ def build(bld):
'SMALLER' : '8',
'SMALL' : '9',
'NORMAL' : '10',
'BIG' : '14',
'BIGGER' : '17',
'LARGE' : '18',
'LARGER' : '24',