Paul Davis 87726495c3 Merged changes from trunk 1699:1751 into 2.1-staging ... git-svn-id: svn://localhost/ardour2/branches/2.1-staging@1752 d708f5d6-7413-0410-9779-e7cbd77b26cf		2007-04-26 20:54:31 +00:00
..
config	merged with 1697 revision of trunk (which is post-rc1 but pre-rc2	2007-04-11 13:07:51 +00:00
css	merged with 1697 revision of trunk (which is post-rc1 but pre-rc2	2007-04-11 13:07:51 +00:00
images	merged with 1697 revision of trunk (which is post-rc1 but pre-rc2	2007-04-11 13:07:51 +00:00
templates	merged with 1697 revision of trunk (which is post-rc1 but pre-rc2	2007-04-11 13:07:51 +00:00
xml	Merged changes from trunk 1699:1751 into 2.1-staging	2007-04-26 20:54:31 +00:00
xmlformat	merged with 1697 revision of trunk (which is post-rc1 but pre-rc2	2007-04-11 13:07:51 +00:00
xsl	merged with 1697 revision of trunk (which is post-rc1 but pre-rc2	2007-04-11 13:07:51 +00:00
catalog.xml	merged with 1697 revision of trunk (which is post-rc1 but pre-rc2	2007-04-11 13:07:51 +00:00
Makefile	merged with 1697 revision of trunk (which is post-rc1 but pre-rc2	2007-04-11 13:07:51 +00:00