Anna Schumaker 412dc67e1f Merge branch 'master' into Ocarina-next ... Conflicts: Sconstruct gui/collection_mgr.cpp		2014-08-19 08:08:55 -04:00
..
applications	Create a .desktop file	2014-04-06 19:57:06 -04:00
ocarina	Merge branch 'master' into Ocarina-next	2014-08-19 08:08:55 -04:00