merged with 1697 revision of trunk (which is post-rc1 but pre-rc2

git-svn-id: svn://localhost/ardour2/branches/2.1-staging@1698 d708f5d6-7413-0410-9779-e7cbd77b26cf
2007-04-11 13:07:51 +00:00
parent 4bf712f501
commit 45d3ec1437
696 changed files with 48513 additions and 22850 deletions
--- a/libs/surfaces/control_protocol/basic_ui.cc
+++ b/libs/surfaces/control_protocol/basic_ui.cc
@@ -16,7 +16,6 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

-    $Id$
 */

 #include <pbd/pthread_utils.h>