Commit Graph

2 Commits (3dea8343de0775abb480584dfd55a4e108086a0c)

Author SHA1 Message Date
Matchman Green 98f1bba4ab added -v to display version 2012-05-06 22:40:58 +08:00
Matchman Green d4a8d9fb65 Merge branch 'massix'
Conflicts:
	CMakeLists.txt
2012-05-02 23:30:49 +08:00