summaryrefslogtreecommitdiff
path: root/src/modinfowithconflictinfo.cpp
Commit message (Expand)AuthorAgeFilesLines
* Allow selecting overwrite to trigger mod conflict highlightsLostDragonist2019-03-091-10/+10
* Fix conflict detection concerning overwriteLostDragonist2019-03-091-1/+2
* Clean up and fix merge issuesLostDragonist2018-12-121-1/+1
* Added red archive conflict icon and made the conflicts tab change font for fi...Al12rs2018-12-121-1/+2
* Add loose file/archive conflict iconsSilarn2018-12-121-24/+62
* Initial archive conflict parsingSilarn2018-12-121-6/+69
* Support for multi-game downloadsSilarn2018-04-161-2/+2
* Revert "Applied clang-format on source"Sandro Jäckel2018-02-231-84/+92
* Applied clang-format on sourceSandro Jäckel2018-02-221-92/+84
* Implement file priority for loose files > archivesJeremy Rimpo2017-12-171-5/+5
* Added functionality to use the web page link in a fomod to supply an optional...Thomas Tanner2015-10-151-0/+130