<feed xmlns='http://www.w3.org/2005/Atom'>
<title>ariadne.git/src/modconflicticondelegate.cpp, branch master</title>
<subtitle>Linux port of mod organizer</subtitle>
<id>http://git.schererleander.de/ariadne.git/atom/src/modconflicticondelegate.cpp?h=master</id>
<link rel='self' href='http://git.schererleander.de/ariadne.git/atom/src/modconflicticondelegate.cpp?h=master'/>
<link rel='alternate' type='text/html' href='http://git.schererleander.de/ariadne.git/'/>
<updated>2023-07-09T15:20:40Z</updated>
<entry>
<title>Apply clang-format.</title>
<updated>2023-07-09T15:20:40Z</updated>
<author>
<name>Mikaël Capelle</name>
<email>capelle.mikael@gmail.com</email>
</author>
<published>2022-05-17T09:47:01Z</published>
<link rel='alternate' type='text/html' href='http://git.schererleander.de/ariadne.git/commit/?id=d13f6bb870cdda71257f665367be8ef9fca86255'/>
<id>urn:sha1:d13f6bb870cdda71257f665367be8ef9fca86255</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Display children contents in collapsed separator.</title>
<updated>2021-01-10T09:27:22Z</updated>
<author>
<name>Mikaël Capelle</name>
<email>capelle.mikael@gmail.com</email>
</author>
<published>2021-01-06T18:43:21Z</published>
<link rel='alternate' type='text/html' href='http://git.schererleander.de/ariadne.git/commit/?id=1ac3f4d8e8ee7461f047d34e196df40499e89557'/>
<id>urn:sha1:1ac3f4d8e8ee7461f047d34e196df40499e89557</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Add option to enable/disable displaying conflicts on collapsed separators.</title>
<updated>2021-01-03T15:30:35Z</updated>
<author>
<name>Mikaël Capelle</name>
<email>capelle.mikael@gmail.com</email>
</author>
<published>2021-01-03T15:30:35Z</published>
<link rel='alternate' type='text/html' href='http://git.schererleander.de/ariadne.git/commit/?id=fbd7e777d76c2032d8c4df418e5550b14b9c2943'/>
<id>urn:sha1:fbd7e777d76c2032d8c4df418e5550b14b9c2943</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Remove log.</title>
<updated>2021-01-03T11:28:29Z</updated>
<author>
<name>Mikaël Capelle</name>
<email>capelle.mikael@gmail.com</email>
</author>
<published>2021-01-03T11:28:29Z</published>
<link rel='alternate' type='text/html' href='http://git.schererleander.de/ariadne.git/commit/?id=c36d1126df94d879181a95d63862117a62d5ff60'/>
<id>urn:sha1:c36d1126df94d879181a95d63862117a62d5ff60</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Show conflict icons from children when separator is collapsed.</title>
<updated>2021-01-03T11:24:27Z</updated>
<author>
<name>Mikaël Capelle</name>
<email>capelle.mikael@gmail.com</email>
</author>
<published>2021-01-03T11:24:27Z</published>
<link rel='alternate' type='text/html' href='http://git.schererleander.de/ariadne.git/commit/?id=b708bcc097122e5b4f12b520d7f9880cd3cc28aa'/>
<id>urn:sha1:b708bcc097122e5b4f12b520d7f9880cd3cc28aa</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Clean code and reorganize.</title>
<updated>2021-01-02T14:38:19Z</updated>
<author>
<name>Mikaël Capelle</name>
<email>capelle.mikael@gmail.com</email>
</author>
<published>2021-01-01T14:30:08Z</published>
<link rel='alternate' type='text/html' href='http://git.schererleander.de/ariadne.git/commit/?id=d708287c9e73db94a097b8151ba8f2b6c820a84d'/>
<id>urn:sha1:d708287c9e73db94a097b8151ba8f2b6c820a84d</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Some cleaning. Avoid using Qt::UserRole.</title>
<updated>2021-01-02T14:38:18Z</updated>
<author>
<name>Mikaël Capelle</name>
<email>capelle.mikael@gmail.com</email>
</author>
<published>2021-01-01T11:24:57Z</published>
<link rel='alternate' type='text/html' href='http://git.schererleander.de/ariadne.git/commit/?id=e02ba3b26d30ffb5010394992c69e94b287eacd7'/>
<id>urn:sha1:e02ba3b26d30ffb5010394992c69e94b287eacd7</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Separate conflict flags and render them in separate columns</title>
<updated>2019-12-07T05:12:18Z</updated>
<author>
<name>Silarn</name>
<email>jrim@rimpo.org</email>
</author>
<published>2019-12-07T05:12:18Z</published>
<link rel='alternate' type='text/html' href='http://git.schererleander.de/ariadne.git/commit/?id=b3331ef2c0b50ab2cea4c328e78f6ab58bca099d'/>
<id>urn:sha1:b3331ef2c0b50ab2cea4c328e78f6ab58bca099d</id>
<content type='text'>
</content>
</entry>
</feed>
