3 Commits

Author	SHA1	Message	Date
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