Commit graph

2 commits

Author SHA1 Message Date
Gregory Tertyshny
0f6aaeb611 resolve merge conflict, maybe 2016-12-14 20:20:59 +02:00
Gregory Tertyshny
2ead8d88f5 Makefile and some structuring work 2016-12-14 20:00:58 +02:00