diff options
author | John Emmas <johne53@tiscali.co.uk> | 2013-10-14 19:31:22 +0100 |
---|---|---|
committer | John Emmas <johne53@tiscali.co.uk> | 2013-10-14 19:31:22 +0100 |
commit | e466ce40ad1ba591543020cb7c0aa15dbebef81e (patch) | |
tree | f8e43560917a0a70c48d32ac171e828472cfd794 /gtk2_ardour/wscript | |
parent | 4fac237fdcf025c5fd5aafe207113abd6abb469b (diff) | |
parent | a901f28c6287ff99444d6a8afe67b71531a5f7d0 (diff) |
Merge branch 'master' into windows+cc
Conflicts (hopefully resolved):
gtk2_ardour/ardour_ui.cc
Diffstat (limited to 'gtk2_ardour/wscript')
-rw-r--r-- | gtk2_ardour/wscript | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index 8e1a136931..011126da64 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -640,7 +640,7 @@ def build(bld): # Menus menus_argv = [] if bld.is_defined('GTKOSX'): - menus_argv = [ '-E', '-P', '-DGTKOSX', '-DNOVIDEOTIMELINE' ] + menus_argv = [ '-E', '-P', '-DGTKOSX' ] else: menus_argv = [ '-E', '-P' ] |