merge 12717:12954 from svn+ssh://ardoursvn@subversion.ardour.org/ardour2/branches/3.0

git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12955 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-06-28 13:30:03 +00:00
parent f1fd9c7bdc
commit 6e824e7797
174 changed files with 2923 additions and 2899 deletions

View file

@ -23,7 +23,6 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <cassert>
#include <iostream>
#include <cstdio>
#ifdef __APPLE__