Sort things to reduce merge hell. No functional changes.

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2994 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 64 insertions, 64 deletions

diff --git a/gtk2_ardour/ardour2_ui_default.conf b/gtk2_ardour/ardour2_ui_default.conf
index 8615d8e6d1..5559cd5b9b 100644
--- a/gtk2_ardour/ardour2_ui_default.conf
+++ b/gtk2_ardour/ardour2_ui_default.conf
@@ -1,95 +1,95 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Ardour>
   <Canvas>
-    <Option name="waveform outline" value="0f0f0fc8"/>
-    <Option name="waveform fill" value="3d4753dc"/>
-    <Option name="selected waveform outline" value="0f0f0fcc"/>
-    <Option name="selected waveform fill" value="51518ac8"/>
-    <Option name="clipped waveform" value="ff0000e5"/>
-    <Option name="region base" value="99a7b584"/>
-    <Option name="selected region base" value="51518aff"/>
-    <Option name="audio track base" value="c6d3d868"/>
+    <Option name="active crossfade" value="e8ed3d77"/>
     <Option name="audio bus base" value="dbd1ea68"/>
-    <Option name="midi track base" value="ff8f8f3d"/>
-    <Option name="midi bus base" value="ff0000ee"/>
-    <Option name="time-stretch-fill" value="e2b5b596"/>
-    <Option name="time-stretch-outline" value="63636396"/>
+    <Option name="audio track base" value="c6d3d868"/>
     <Option name="automation line" value="44bc59ff"/>
-    <Option name="processor automation line" value="7aa3f9ff"/>
+    <Option name="automation track fill" value="a0a0ce68"/>
+    <Option name="automation track outline" value="282828ff"/>
+    <Option name="cdmarkerbar" value="9090a3ff"/>
+    <Option name="clipped waveform" value="ff0000e5"/>
     <Option name="control point fill" value="000000ff"/>
     <Option name="control point outline" value="000000ff"/>
-    <Option name="entered control point outline" value="ff0000ee"/>
-    <Option name="entered control point selected" value="ff3535ff"/>
-    <Option name="entered control point" value="000000cc"/>
     <Option name="control point selected" value="00ff00ff"/>
     <Option name="control point" value="ff0000ff"/>
-    <Option name="automation track fill" value="a0a0ce68"/>
-    <Option name="automation track outline" value="282828ff"/>
     <Option name="crossfade editor base" value="282d49ff"/>
-    <Option name="crossfade editor line" value="000000ff"/>
-    <Option name="selected crossfade editor line" value="00dbdbff"/>
     <Option name="crossfade editor line shading" value="00a0d154"/>
+    <Option name="crossfade editor line" value="000000ff"/>
     <Option name="crossfade editor point fill" value="00ff00ff"/>
     <Option name="crossfade editor point outline" value="0000ffff"/>
     <Option name="crossfade editor wave" value="ffffff28"/>
-    <Option name="selected crossfade editor wave" value="f9ea14a0"/>
     <Option name="crossfade line" value="000000ff"/>
-    <Option name="active crossfade" value="e8ed3d77"/>
+    <Option name="EditPoint" value="0000ffff"/>
+    <Option name="EnteredAutomationLine" value="dd6363ff"/>
+    <Option name="entered control point outline" value="ff0000ee"/>
+    <Option name="entered control point selected" value="ff3535ff"/>
+    <Option name="entered control point" value="000000cc"/>
+    <Option name="EnteredGainLine" value="dd6363ff"/>
+    <Option name="EnteredMarker" value="dd6363ff"/>
+    <Option name="FrameHandle" value="7c00ff96"/>
+    <Option name="GainLineInactive" value="9fbca4c5"/>
+    <Option name="GainLine" value="00bc20ff"/>
+    <Option name="GhostTrackBase" value="44007c7f"/>
+    <Option name="GhostTrackWaveClip" value="ff000000"/>
+    <Option name="GhostTrackWave" value="02fd004c"/>
+    <Option name="GhostTrackZeroLine" value="e500e566"/>
+    <Option name="ImageTrack" value="ddddd8ff"/>
     <Option name="inactive crossfade" value="e8ed3d77"/>
-    <Option name="location marker" value="c4f411ff"/>
-    <Option name="location range" value="497a59ff"/>
     <Option name="location cd marker" value="1ee8c4ff"/>
     <Option name="location loop" value="35964fff"/>
+    <Option name="location marker" value="c4f411ff"/>
     <Option name="location punch" value="7c3a3aff"/>
-    <Option name="verbose canvas cursor" value="f4f214bc"/>
-    <Option name="marker label" value="000000ff"/>
+    <Option name="location range" value="497a59ff"/>
     <Option name="marker bar separator" value="30303088"/>
-    <Option name="meterbar" value="666672ff"/>
-    <Option name="tempo bar" value="72727fff"/>
-    <Option name="rangemarker bar" value="7f7f8cff"/>
-    <Option name="TransportMarkerBar" value="8c8c96ff"/>
-    <Option name="cdmarkerbar" value="9090a3ff"/>
     <Option name="markerbar" value="9898a3ff"/>
-    <Option name="RangeDragBarRect" value="969696c6"/>
-    <Option name="RangeDragRect" value="82c696c6"/>
-    <Option name="TransportDragRect" value="969696c6"/>
     <Option name="MarkerDragLine" value="004f00f9"/>
-    <Option name="TransportLoopRect" value="1e7728f9"/>
-    <Option name="TransportPunchRect" value="6d2828e5"/>
-    <Option name="PunchLine" value="a80000ff"/>
-    <Option name="ZoomRect" value="c6d1b26d"/>
-    <Option name="RubberBandRect" value="c6c6c659"/>
-    <Option name="EnteredGainLine" value="dd6363ff"/>
-    <Option name="EnteredAutomationLine" value="dd6363ff"/>
-    <Option name="EnteredMarker" value="dd6363ff"/>
-    <Option name="MeterMarker" value="f2425bff"/>
-    <Option name="TempoMarker" value="f2425bff"/>
-    <Option name="MeasureLineBeat" value="72727266"/>
-    <Option name="MeasureLineBar" value="8c8c988c"/>
-    <Option name="GhostTrackBase" value="44007c7f"/>
-    <Option name="GhostTrackWave" value="02fd004c"/>
-    <Option name="GhostTrackWaveClip" value="ff000000"/>
-    <Option name="GhostTrackZeroLine" value="e500e566"/>
-    <Option name="ImageTrack" value="ddddd8ff"/>
+    <Option name="marker label" value="000000ff"/>
     <Option name="MarkerTrack" value="ddddd8ff"/>
-    <Option name="ZeroLine" value="bdbdbd8d"/>
-    <Option name="GainLine" value="00bc20ff"/>
-    <Option name="GainLineInactive" value="9fbca4c5"/>
+    <Option name="MeasureLineBar" value="8c8c988c"/>
+    <Option name="MeasureLineBeat" value="72727266"/>
+    <Option name="meterbar" value="666672ff"/>
+    <Option name="MeterColorBase" value="0000ffff"/>
+    <Option name="MeterColorClip" value="ff0000ff"/>
+    <Option name="MeterColorMid" value="73f9baff"/>
+    <Option name="MeterColorTop" value="00fd5dff"/>
+    <Option name="MeterMarker" value="f2425bff"/>
+    <Option name="midi bus base" value="ff0000ee"/>
+    <Option name="midi track base" value="ff8f8f3d"/>
+    <Option name="NameHighlightFill" value="0000ffff"/>
+    <Option name="NameHighlightOutline" value="7c00ff96"/>
+    <Option name="PlayHead" value="ff0000ff"/>
+    <Option name="processor automation line" value="7aa3f9ff"/>
+    <Option name="PunchLine" value="a80000ff"/>
+    <Option name="RangeDragBarRect" value="969696c6"/>
+    <Option name="RangeDragRect" value="82c696c6"/>
+    <Option name="rangemarker bar" value="7f7f8cff"/>
     <Option name="RecordingRect" value="e5c6c6ff"/>
+    <Option name="region base" value="99a7b584"/>
+    <Option name="RubberBandRect" value="c6c6c659"/>
+    <Option name="selected crossfade editor line" value="00dbdbff"/>
+    <Option name="selected crossfade editor wave" value="f9ea14a0"/>
+    <Option name="selected region base" value="51518aff"/>
+    <Option name="selected waveform fill" value="51518ac8"/>
+    <Option name="selected waveform outline" value="0f0f0fcc"/>
     <Option name="SelectionRect" value="e8f4d377"/>
     <Option name="Selection" value="636363b2"/>
-    <Option name="VestigialFrame" value="00000092"/>
+    <Option name="tempo bar" value="72727fff"/>
+    <Option name="TempoMarker" value="f2425bff"/>
     <Option name="TimeAxisFrame" value="000000cb"/>
-    <Option name="NameHighlightFill" value="0000ffff"/>
-    <Option name="NameHighlightOutline" value="7c00ff96"/>
-    <Option name="FrameHandle" value="7c00ff96"/>
+    <Option name="time-stretch-fill" value="e2b5b596"/>
+    <Option name="time-stretch-outline" value="63636396"/>
+    <Option name="TransportDragRect" value="969696c6"/>
+    <Option name="TransportLoopRect" value="1e7728f9"/>
+    <Option name="TransportMarkerBar" value="8c8c96ff"/>
+    <Option name="TransportPunchRect" value="6d2828e5"/>
     <Option name="TrimHandleLocked" value="ea0f0f28"/>
     <Option name="TrimHandle" value="1900ff44"/>
-    <Option name="EditPoint" value="0000ffff"/>
-    <Option name="PlayHead" value="ff0000ff"/>
-    <Option name="MeterColorBase" value="0000ffff"/>
-    <Option name="MeterColorMid" value="73f9baff"/>
-    <Option name="MeterColorTop" value="00fd5dff"/>
-    <Option name="MeterColorClip" value="ff0000ff"/>
+    <Option name="verbose canvas cursor" value="f4f214bc"/>
+    <Option name="VestigialFrame" value="00000092"/>
+    <Option name="waveform fill" value="3d4753dc"/>
+    <Option name="waveform outline" value="0f0f0fc8"/>
+    <Option name="ZeroLine" value="bdbdbd8d"/>
+    <Option name="ZoomRect" value="c6d1b26d"/>
   </Canvas>
 </Ardour>