diff --git a/SConstruct b/SConstruct index 5f81a1739c..b3cada1303 100644 --- a/SConstruct +++ b/SConstruct @@ -16,7 +16,7 @@ import SCons.Node.FS SConsignFile() EnsureSConsVersion(0, 96) -ardour_version = '2.0.4' +ardour_version = '2.0.5' subst_dict = { } diff --git a/libs/ardour/ardour/automation_event.h b/libs/ardour/ardour/automation_event.h index 9792e00552..9b61224079 100644 --- a/libs/ardour/ardour/automation_event.h +++ b/libs/ardour/ardour/automation_event.h @@ -67,7 +67,7 @@ typedef boost::fast_pool_allocator AutomationEventList; + typedef std::list AutomationEventList; typedef AutomationEventList::iterator iterator; typedef AutomationEventList::const_iterator const_iterator; diff --git a/svn_revision.h b/svn_revision.h index fb1ea6ad9c..dbec20f285 100644 --- a/svn_revision.h +++ b/svn_revision.h @@ -1,4 +1,4 @@ #ifndef __ardour_svn_revision_h__ #define __ardour_svn_revision_h__ -static const char* ardour_svn_revision = "2094"; +static const char* ardour_svn_revision = "2201"; #endif