bump to 2.0.5

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2207 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/SConstruct b/SConstruct
index 5f81a1739cc9ba13cb41e28e1662e9ee33c10382..b3cada1303c794010280d1e235160e6b88211943 100644 (file)
--- 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 9792e00552afb8db5512f81543824f7693fd0b3c..9b612240795ecbd8588e8a8415947ee46009900a 100644 (file)
--- a/libs/ardour/ardour/automation_event.h
+++ b/libs/ardour/ardour/automation_event.h
@@ -67,7 +67,7 @@ typedef boost::fast_pool_allocator<ControlEvent*,
 class AutomationList : public PBD::StatefulDestructible
 {
   public:
-       typedef std::list<ControlEvent*,ControlEventAllocator> AutomationEventList;
+       typedef std::list<ControlEvent*> AutomationEventList;
        typedef AutomationEventList::iterator iterator;
        typedef AutomationEventList::const_iterator const_iterator;
 

diff --git a/svn_revision.h b/svn_revision.h
index fb1ea6ad9ccbc4eb74ff54264b2408d642eb2f64..dbec20f285e5313300df705279e90fe75df7c038 100644 (file)
--- 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