Just put everything new in. Conflict resolution will be later

1 files changed, 4 insertions, 3 deletions

diff --git a/ftnoir_tracker_pt/ftnoir_tracker_pt_dll.h b/ftnoir_tracker_pt/ftnoir_tracker_pt_dll.h
index 15ad63aa..f684c55b 100644
--- a/ftnoir_tracker_pt/ftnoir_tracker_pt_dll.h
+++ b/ftnoir_tracker_pt/ftnoir_tracker_pt_dll.h
@@ -5,10 +5,11 @@
  * copyright notice and this permission notice appear in all copies.

  */

 

-#include "..\ftnoir_tracker_base\ftnoir_tracker_base.h"

+#include "ftnoir_tracker_base/ftnoir_tracker_base.h"

+#include "facetracknoir/global-settings.h"

 

 //-----------------------------------------------------------------------------

-class TrackerDll : public ITrackerDll

+class TrackerDll : public Metadata

 {

 	// ITrackerDll interface

 	void Initialize() {}

@@ -16,4 +17,4 @@ class TrackerDll : public ITrackerDll
 	void getShortName(QString *strToBeFilled);

 	void getDescription(QString *strToBeFilled);

 	void getIcon(QIcon *icon);

-};
\ No newline at end of file
+};