Anna Schumaker 412dc67e1f Merge branch 'master' into Ocarina-next ... Conflicts: Sconstruct gui/collection_mgr.cpp		2014-08-19 08:08:55 -04:00
..
colmgr.cpp	Merge branch 'master' into Ocarina-next	2014-08-19 08:08:55 -04:00
lib.cpp	core: Create a single init() function	2014-06-29 10:36:55 -04:00
model.cpp	model: Move the custom TreeModel from gui/ to lib/	2014-06-29 10:48:23 -04:00
plist.cpp	plist: Move more playlist functions into lib/	2014-07-27 11:41:40 -04:00
Sconscript	lib: Initialize the GtkBuilder from the middle layer	2014-06-15 11:31:04 -04:00