Joel Holdsworth 8b5733c293 Merge branch 'sharedlib' of git.lumiera.org:/git/lumiera/ct into gui ... Conflicts: src/gui/Makefile.am		2008-12-16 20:44:33 +00:00
..
timeline	Merge branch 'sharedlib' of git.lumiera.org:/git/lumiera/ct into gui	2008-12-16 20:44:33 +00:00
timeline-widget.cpp	Corrected some problems that emerged on the build server	2008-12-13 13:57:19 +00:00
timeline-widget.hpp	Added some documentation to timeline-widget.hpp	2008-12-10 17:22:49 +00:00
video-display-widget.cpp	Corrected namespaces from lumiera::gui:: to gui::	2008-10-18 00:13:27 +01:00
video-display-widget.hpp	Corrected namespaces from lumiera::gui:: to gui::	2008-10-18 00:13:27 +01:00