Anna Schumaker 412dc67e1f Merge branch 'master' into Ocarina-next ... Conflicts: Sconstruct gui/collection_mgr.cpp		2014-08-19 08:08:55 -04:00
..
ocarina.png	gui: Add a window icon	2014-04-06 19:57:04 -04:00
ocarina6.glade	Merge branch 'master' into Ocarina-next	2014-08-19 08:08:55 -04:00
ocarina512.png	gui: Add a window icon	2014-04-06 19:57:04 -04:00