merge changes for 2.0.1/2.0.2, plus some fixes to issues made apparent by conflicts

git-svn-id: svn://localhost/ardour2/branches/midi@1812 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2007-05-10 02:23:12 +00:00
parent 1e7bcd8b0f
commit 7f64e5ac4c
8 changed files with 109 additions and 43 deletions

View file

@ -1,4 +1,4 @@
#ifndef __ardour_svn_revision_h__
#define __ardour_svn_revision_h__
static const char* ardour_svn_revision = "1745";
static const char* ardour_svn_revision = "1801";
#endif