summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2007-08-01 05:05:10 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2007-08-01 05:05:10 +0000
commit301d03743c5c1cef5cf9c36bc97729e1e888df07 (patch)
treea1cfa2c3ce55c8c732498c57be52e4046f58ef09
parentd0d44def1d939a56fb840c03196e41cccb97c311 (diff)
bump to 2.0.5
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2207 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r--SConstruct2
-rw-r--r--libs/ardour/ardour/automation_event.h2
-rw-r--r--svn_revision.h2
3 files changed, 3 insertions, 3 deletions
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<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 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