Fix conflict

2014-11-25 21:29:00 +02:00
parent eea784ce71
commit ed11ccbf50
17 changed files with 0 additions and 18 deletions
--- a/src/core/Effect.cpp
+++ b/src/core/Effect.cpp
@@ -217,4 +217,3 @@ void Effect::resample( int _i, const sampleFrame * _src_buf,
 	}
 }

-#include "moc_Effect.cxx"
--- a/src/core/FxMixer.cpp
+++ b/src/core/FxMixer.cpp
@@ -781,4 +781,3 @@ void FxMixer::validateChannelName( int index, int oldIndex )
 	}
 }

-#include "moc_FxMixer.cxx"
--- a/src/core/Plugin.cpp
+++ b/src/core/Plugin.cpp
@@ -221,4 +221,3 @@ QDomElement Plugin::Descriptor::SubPluginFeatures::Key::saveXML(
 	return e;
 }

-#include "moc_Plugin.cxx"
--- a/src/gui/widgets/InstrumentMidiIOView.cpp
+++ b/src/gui/widgets/InstrumentMidiIOView.cpp
@@ -201,4 +201,3 @@ void InstrumentMidiIOView::modelChanged()
 	}
 }

-#include "moc_InstrumentMidiIOView.cxx"
--- a/src/gui/widgets/MeterDialog.cpp
+++ b/src/gui/widgets/MeterDialog.cpp
@@ -113,4 +113,3 @@ void MeterDialog::modelChanged()
 	m_denominator->setModel( &mm->denominatorModel() );
 }

-#include "moc_MeterDialog.cxx"
--- a/src/tracks/AutomationTrack.cpp
+++ b/src/tracks/AutomationTrack.cpp
@@ -192,4 +192,3 @@ void AutomationTrackView::dropEvent( QDropEvent * _de )
 }


-#include "moc_AutomationTrack.cxx"