Hans Fugal 7ff370e798 Merging from trunk ... git-svn-id: svn://localhost/ardour2/branches/undo@638 d708f5d6-7413-0410-9779-e7cbd77b26cf		2006-06-22 23:40:55 +00:00
..
control_protocol	Merging from trunk	2006-06-22 23:40:55 +00:00
basic_ui.cc	Merging from trunk	2006-06-22 23:40:55 +00:00
control_protocol.cc	Merging from trunk	2006-06-22 23:40:55 +00:00
SConscript	Merging from trunk	2006-06-22 23:40:55 +00:00
smpte.cc	Merging from trunk	2006-06-22 23:40:55 +00:00