Commit Graph

4 Commits

Author SHA1 Message Date
ca333
eac0d62477 OSX/WIN port dependencies 2018-04-21 17:15:36 +02:00
jl777
e73b2055c6 Merge branch 'beta' into mergemaster
# Conflicts:
#	src/main.cpp
2018-04-16 10:16:01 +03:00
ca333
9d36579649 uni3 2017-10-09 11:45:49 +02:00
Nathan Wilcox
0ee1d5d133 Add a depends description for googletest. 2016-04-18 11:13:05 -07:00