Commit Graph

3 Commits

Author SHA1 Message Date
ca333
ecaa9c46bf fix snark for WIN 2018-04-21 17:42:23 +02:00
ca333
b8d174ef94 add Makefile 2018-04-16 15:18:45 +02:00
jl777
e73b2055c6 Merge branch 'beta' into mergemaster
# Conflicts:
#	src/main.cpp
2018-04-16 10:16:01 +03:00