Manually Merged ATK and Rythal
Hi to all,
Today I've merged the German Files with Rythal's Current State,
I have one Information to all Developers here, please do not Correct Whitespace things at the Moment, because most merge Issues are Whitespace Conficts,
i would sugest corrections of Whitespace should be done if all is finished.
I've seen Rythal has done the same, I've done but my Version is broken because of a mess done by kdiff so I will wait to see the finished Version from Rythal and pull my Version back
But to make it easier from now please wait with whitespace corrections to the Moment all is fixed
Greetings
Samyonair
Last edited by samyonair : 11-24-14 at 03:08 AM.
Reason: Failure
|