Commit Graph

2 Commits (199a0500996bb3bb8b0349a28e996f269ee747e4)

Author SHA1 Message Date
Vitaliy Filippov 199a050099 Change deprecated auto_ptr to unique_ptr 2016-09-01 16:19:14 +03:00
Matchman Green d4a8d9fb65 Merge branch 'massix'
Conflicts:
	CMakeLists.txt
2012-05-02 23:30:49 +08:00