Paul Davis 87726495c3 Merged changes from trunk 1699:1751 into 2.1-staging ... git-svn-id: svn://localhost/ardour2/branches/2.1-staging@1752 d708f5d6-7413-0410-9779-e7cbd77b26cf		2007-04-26 20:54:31 +00:00
..
scripts	Merged changes from trunk 1699:1751 into 2.1-staging	2007-04-26 20:54:31 +00:00
bcf_surface.cc	Merged changes from trunk 1699:1751 into 2.1-staging	2007-04-26 20:54:31 +00:00
bcf_surface.h	merged with 1697 revision of trunk (which is post-rc1 but pre-rc2	2007-04-11 13:07:51 +00:00
controls.cc	merged with 1697 revision of trunk (which is post-rc1 but pre-rc2	2007-04-11 13:07:51 +00:00
controls.h	merged with 1697 revision of trunk (which is post-rc1 but pre-rc2	2007-04-11 13:07:51 +00:00
interface.cc	merged with 1697 revision of trunk (which is post-rc1 but pre-rc2	2007-04-11 13:07:51 +00:00
mackie_button_handler.cc	merged with 1697 revision of trunk (which is post-rc1 but pre-rc2	2007-04-11 13:07:51 +00:00
mackie_button_handler.h	merged with 1697 revision of trunk (which is post-rc1 but pre-rc2	2007-04-11 13:07:51 +00:00
mackie_control_exception.h	merged with 1697 revision of trunk (which is post-rc1 but pre-rc2	2007-04-11 13:07:51 +00:00
mackie_control_protocol.cc	Merged changes from trunk 1699:1751 into 2.1-staging	2007-04-26 20:54:31 +00:00
mackie_control_protocol.h	Merged changes from trunk 1699:1751 into 2.1-staging	2007-04-26 20:54:31 +00:00
mackie_control_protocol_poll.cc	merged with 1697 revision of trunk (which is post-rc1 but pre-rc2	2007-04-11 13:07:51 +00:00
mackie_midi_builder.cc	merged with 1697 revision of trunk (which is post-rc1 but pre-rc2	2007-04-11 13:07:51 +00:00
mackie_midi_builder.h	merged with 1697 revision of trunk (which is post-rc1 but pre-rc2	2007-04-11 13:07:51 +00:00
mackie_port.cc	merged with 1697 revision of trunk (which is post-rc1 but pre-rc2	2007-04-11 13:07:51 +00:00
mackie_port.h	merged with 1697 revision of trunk (which is post-rc1 but pre-rc2	2007-04-11 13:07:51 +00:00
mackie_surface.cc	merged with 1697 revision of trunk (which is post-rc1 but pre-rc2	2007-04-11 13:07:51 +00:00
mackie_surface.h	merged with 1697 revision of trunk (which is post-rc1 but pre-rc2	2007-04-11 13:07:51 +00:00
midi_byte_array.cc	merged with 1697 revision of trunk (which is post-rc1 but pre-rc2	2007-04-11 13:07:51 +00:00
midi_byte_array.h	merged with 1697 revision of trunk (which is post-rc1 but pre-rc2	2007-04-11 13:07:51 +00:00
route_signal.cc	merged with 1697 revision of trunk (which is post-rc1 but pre-rc2	2007-04-11 13:07:51 +00:00
route_signal.h	merged with 1697 revision of trunk (which is post-rc1 but pre-rc2	2007-04-11 13:07:51 +00:00
SConscript	merged with 1697 revision of trunk (which is post-rc1 but pre-rc2	2007-04-11 13:07:51 +00:00
surface.cc	merged with 1697 revision of trunk (which is post-rc1 but pre-rc2	2007-04-11 13:07:51 +00:00
surface.h	merged with 1697 revision of trunk (which is post-rc1 but pre-rc2	2007-04-11 13:07:51 +00:00
surface_port.cc	merged with 1697 revision of trunk (which is post-rc1 but pre-rc2	2007-04-11 13:07:51 +00:00
surface_port.h	merged with 1697 revision of trunk (which is post-rc1 but pre-rc2	2007-04-11 13:07:51 +00:00
test.cc	merged with 1697 revision of trunk (which is post-rc1 but pre-rc2	2007-04-11 13:07:51 +00:00
TODO	merged with 1697 revision of trunk (which is post-rc1 but pre-rc2	2007-04-11 13:07:51 +00:00
types.cc	merged with 1697 revision of trunk (which is post-rc1 but pre-rc2	2007-04-11 13:07:51 +00:00
types.h	merged with 1697 revision of trunk (which is post-rc1 but pre-rc2	2007-04-11 13:07:51 +00:00