Joel Holdsworth 87ba2ab3db Merge branch 'master' of git://git.lumiera.org/LUMIERA into gui ... Conflicts: icons/Makefile.am src/gui/Makefile.am		2008-10-23 00:15:46 +01:00
..
prerendered	Added 22x22 and 32x32 versions of assets and viewer panel icons	2008-08-16 17:52:06 +01:00
svg	Added track tree support and added widgets to headers	2008-10-22 23:11:23 +01:00
Makefile.am	Merge branch 'master' of git://git.lumiera.org/LUMIERA into gui	2008-10-23 00:15:46 +01:00
timeline-panel.svg	More work on icons	2008-05-16 19:23:12 +01:00