0xboobface 13c5bdfd40 Change labels in the merge settings ... Change labels in the merge settings to make it clearer, that the merge directory also affects the manual merge		2018-08-29 14:03:43 +02:00
..
assembly	Added assembly descriptor for win32	2018-08-09 15:31:00 +02:00
main	Change labels in the merge settings	2018-08-29 14:03:43 +02:00
test	Add update check	2018-08-28 14:48:00 +02:00