diff options
| author | LostDragonist <lost.dragonist@gmail.com> | 2019-01-25 10:19:44 -0600 |
|---|---|---|
| committer | LostDragonist <lost.dragonist@gmail.com> | 2019-01-25 10:19:44 -0600 |
| commit | a68a027febe6e094218654a24d4b5f9bdc31391a (patch) | |
| tree | a259919f61020f9f74553c63d3a5e6f8b023f7b7 /src/modflagicondelegate.h | |
| parent | 63511cd390e1c1b7d6b28edcd691c1f72a81ca48 (diff) | |
| parent | 0ab87850c4cb405b93c592e455a9d052ec84f66f (diff) | |
Merge remote-tracking branch 'remotes/origin/archive_conflicts_2' into Develop
Diffstat (limited to 'src/modflagicondelegate.h')
| -rw-r--r-- | src/modflagicondelegate.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/modflagicondelegate.h b/src/modflagicondelegate.h index b31a250b..0f257c7d 100644 --- a/src/modflagicondelegate.h +++ b/src/modflagicondelegate.h @@ -15,6 +15,8 @@ private: QString getFlagIcon(ModInfo::EFlag flag) const;
private:
static ModInfo::EFlag m_ConflictFlags[4];
+ static ModInfo::EFlag m_ArchiveLooseConflictFlags[2];
+ static ModInfo::EFlag m_ArchiveConflictFlags[3];
};
#endif // MODFLAGICONDELEGATE_H
|