Commit Graph

2 Commits

Author SHA1 Message Date
jl777
0ea9ae3c05 Update copyright to 2019 2018-12-31 21:41:05 -11:00
jl777
e73b2055c6 Merge branch 'beta' into mergemaster
# Conflicts:
#	src/main.cpp
2018-04-16 10:16:01 +03:00