Stephen Birarda f8c832e50b resolve conflicts on merge with upstream master		2015-07-17 16:48:46 -07:00
..
res/fonts	move fonts to sdff files, load with qrc	2015-02-06 11:48:55 -08:00
src	resolve conflicts on merge with upstream master	2015-07-17 16:48:46 -07:00
CMakeLists.txt	add a missing library link	2015-07-15 15:58:05 -07:00