Anna Schumaker 412dc67e1f Merge branch 'master' into Ocarina-next ... Conflicts: Sconstruct gui/collection_mgr.cpp		2014-08-19 08:08:55 -04:00
..
core	Merge branch 'master' into Ocarina-next	2014-08-19 08:08:55 -04:00
Data	Add missing deck file for tests	2014-06-05 10:42:41 -04:00
gui	gui: Change default page	2014-04-06 19:57:00 -04:00
lib	model: Create a basic unit test	2014-06-29 11:40:15 -04:00
Music	tags: Check that a Track was tagged correctly	2014-06-22 12:35:08 -04:00
gen_library.sh	gen_library.sh: Only copy .ogg files	2014-06-22 12:59:28 -04:00
Sconscript	Merge branch 'master' into Ocarina-next	2014-06-26 17:04:58 -04:00