Merge

1 files changed, 5 insertions, 0 deletions

diff --git a/src/modlist.h b/src/modlist.h
index b946e009..18342aa5 100644
--- a/src/modlist.h
+++ b/src/modlist.h
@@ -97,6 +97,8 @@ public:
 
   void changeModPriority(int sourceIndex, int newPriority);
 
+  void setOverwriteMarkers(const std::set<unsigned int> &overwrite, const std::set<unsigned int> &overwritten);
+
   void modInfoAboutToChange(ModInfo::Ptr info);
   void modInfoChanged(ModInfo::Ptr info);
 
@@ -277,6 +279,9 @@ private:
 
   bool m_DropOnItems;
 
+  std::set<unsigned int> m_Overwrite;
+  std::set<unsigned int> m_Overwritten;
+
   TModInfoChange m_ChangeInfo;
 
   SignalModStateChanged m_ModStateChanged;