Anna Schumaker 412dc67e1f Merge branch 'master' into Ocarina-next ... Conflicts: Sconstruct gui/collection_mgr.cpp		2014-08-19 08:08:55 -04:00
..
collection_mgr.cpp	Merge branch 'master' into Ocarina-next	2014-08-19 08:08:55 -04:00
collection.cpp	lib: Initialize the GtkBuilder from the middle layer	2014-06-15 11:31:04 -04:00
gui.cpp	Merge branch 'master' into Ocarina-next	2014-08-19 08:08:55 -04:00
history.cpp	lib: Initialize the GtkBuilder from the middle layer	2014-06-15 11:31:04 -04:00
main.cpp	plist: Move more playlist functions into lib/	2014-07-27 11:41:40 -04:00
playlist.cpp	playlist tab cleanups	2014-07-27 11:52:36 -04:00
queue.cpp	lib: Initialize the GtkBuilder from the middle layer	2014-06-15 11:31:04 -04:00
Sconscript	lib: Initialize the GtkBuilder from the middle layer	2014-06-15 11:31:04 -04:00
tabs.cpp	lib: Initialize the GtkBuilder from the middle layer	2014-06-15 11:31:04 -04:00