3 Commits

Include renames

Author	SHA1	Message	Date
Aokromes	400425dc15	Make codacy happy	2018-04-08 10:05:37 +00:00
Aokromes	3b83cd4b2d	Misc: Update manual merger ... By Flameshot P.S. i recomend to use auto-updater	2016-10-25 15:11:53 +02:00
Gacko	938947880a	Move merge_updates_windows.bat to right folder and add Unix version	2014-04-26 10:41:31 +02:00