sneedium 2a1dcd6a38 fix conflicts ... Signed-off-by: sneedium <sneed@sneedmc.org>		2022-06-14 22:36:08 -04:00
..
8x8	NOISSUE Flatten gui and logic libraries into MultiMC	2021-07-25 19:50:44 +02:00
16x16	NOISSUE Flatten gui and logic libraries into MultiMC	2021-07-25 19:50:44 +02:00
22x22	NOISSUE Flatten gui and logic libraries into MultiMC	2021-07-25 19:50:44 +02:00
24x24	NOISSUE Flatten gui and logic libraries into MultiMC	2021-07-25 19:50:44 +02:00
32x32	change cf icon to a more fancy one	2022-05-21 17:49:52 +02:00
48x48	NOISSUE Flatten gui and logic libraries into MultiMC	2021-07-25 19:50:44 +02:00
50x50/instances	NOISSUE Flatten gui and logic libraries into MultiMC	2021-07-25 19:50:44 +02:00
64x64	NOISSUE Flatten gui and logic libraries into MultiMC	2021-07-25 19:50:44 +02:00
128x128	change cf icon to a more fancy one	2022-05-21 17:49:52 +02:00
256x256	NOISSUE Flatten gui and logic libraries into MultiMC	2021-07-25 19:50:44 +02:00
scalable	Merge remote-tracking branch 'upstream/develop' into develop	2022-06-14 21:29:00 -04:00
index.theme	NOISSUE continue debranding...	2021-10-21 00:47:53 +02:00
multimc.qrc	fix conflicts	2022-06-14 22:36:08 -04:00