summaryrefslogtreecommitdiff
path: root/ardour.rc.in
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2008-01-12 23:45:50 +0000
committerDavid Robillard <d@drobilla.net>2008-01-12 23:45:50 +0000
commite92c1669c1cdf857b8a3900abb9f891e6ca9fdad (patch)
treef02725efdfd3473527cb7fa94471a7cff2528880 /ardour.rc.in
parentbf256c168170de1b9e1411bb563c571d67470c05 (diff)
Merge with 2.0-ongoing R2885.
Fix loading of 2.0 sessions. git-svn-id: svn://localhost/ardour2/trunk@2904 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'ardour.rc.in')
-rw-r--r--ardour.rc.in4
1 files changed, 3 insertions, 1 deletions
diff --git a/ardour.rc.in b/ardour.rc.in
index bbc0f091ec..ed40ac465a 100644
--- a/ardour.rc.in
+++ b/ardour.rc.in
@@ -37,7 +37,9 @@
<Option name="destructive-xfade-msecs" value="20"/>
<Option name="periodic-safety-backups" value="1"/>
<Option name="periodic-safety-backup-interval" value="120"/>
- <Option name="show-track-meters" value="1"/>
+ <Option name="show-track-meters" value="1"/>
+ <Option name="default-narrow_ms" value="0"/>
+ <Option name="smpte-format" value="6"/>
</Config>
<extra>
<Keyboard edit-button="3" edit-modifier="4" delete-button="3" delete-modifier="1" snap-modifier="32"/>