102 commits

Author	SHA1	Message	Date
aap	cb12ee03ca	fixed merge	2019-06-02 10:31:40 +02:00
Fire-Head	b1f9e28cd1	skeleton updated, windows specific stuff added	2019-06-02 06:00:38 +03:00