Joel Holdsworth 4faf561019 Merge branch 'master' of git://git.lumiera.org/LUMIERA into gui ... Conflicts: src/gui/panels/timeline-panel.cpp		2008-09-02 22:58:22 +01:00
..
assets-panel.cpp	Made icon loading more robust, and tidied up some code	2008-08-13 19:15:13 +01:00
assets-panel.hpp	Tied gui into main lumiera build	2008-05-14 00:26:00 +01:00
panel.cpp	Fixed order of creation so icons show on the panels	2008-07-15 20:52:24 +01:00
panel.hpp	Corrected a small dependancy issue in panel.hpp	2008-08-16 17:43:59 +01:00
timeline-panel.cpp	Merge branch 'master' of git://git.lumiera.org/LUMIERA into gui	2008-09-02 22:58:22 +01:00
timeline-panel.hpp	Added time indication	2008-08-30 14:00:47 +01:00
viewer-panel.cpp	Made icon loading more robust, and tidied up some code	2008-08-13 19:15:13 +01:00
viewer-panel.hpp	Tied gui into main lumiera build	2008-05-14 00:26:00 +01:00