smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-17 20:26:30 +01:00
Code Issues Projects Releases Wiki Activity

some missing conflict resolution from most recent merge with master

Browse source
This commit is contained in:
Paul Davis 2014-08-27 14:09:15 -04:00
parent 18a9bd459a
commit e80ff9b723
2 changed files with 0 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gtk2_ardour/ui/audio_time_axis.xml
View file

@ -3,7 +3,6 @@
<RouteUI bgnormal="#383838" bgactive="#545454"> <RouteUI bgnormal="#383838" bgactive="#545454">
<Vbox> <Vbox>
<EventBox id="upper_drop_indicator" visible="false" noshowall="true" height="2" bgnormal="#1CA3B3" bgactive="#1CA3B3"/> <EventBox id="upper_drop_indicator" visible="false" noshowall="true" height="2" bgnormal="#1CA3B3" bgactive="#1CA3B3"/>
>>>>>>> master
<HBox> <HBox>
<VBox> <VBox>
<EventBox height="1" bgnormal="#494949" bgactive="#494949"/> <EventBox height="1" bgnormal="#494949" bgactive="#494949"/>

1
gtk2_ardour/ui/editor_mixer.xml
View file

@ -253,7 +253,6 @@
</VBox> </VBox>
<HBox visible="false" <HBox visible="false"
noshowall="true"> noshowall="true">
>>>>>>> master
<Button id="show_sends_button"/> <Button id="show_sends_button"/>
<Button id="monitor_disk_button"/> <Button id="monitor_disk_button"/>
<Button id="comment_button"/> <Button id="comment_button"/>