Seth Alves 26639aac15 Merge pull request #8789 from Atlante45/fix/settings ... Use JSON for application Settings		2016-12-15 07:00:46 -08:00
..
src	Merge pull request #8789 from Atlante45/fix/settings	2016-12-15 07:00:46 -08:00
CMakeLists.txt	Now works on mac, small build change for that	2016-12-05 11:11:30 -08:00