|
|
7f18913e6d
|
fix errors in manual conflict resolution
|
2014-06-02 11:42:35 -04:00 |
|
|
|
8c9749e42f
|
merge with master and fix 4 conflicts by hand
|
2014-06-02 11:32:13 -04:00 |
|
|
|
99bf5d9eed
|
backport 1d85ab27a7 and ba128eea from cairocanvas branch to remove GIO (possible hotfix release)
|
2014-04-14 12:53:30 -04:00 |
|
|
|
ba128eea50
|
replace use of Gio:: for plugin state
|
2014-03-22 17:42:26 +01:00 |
|
|
|
57f9a4c344
|
Merge branch 'windows' of git://git.ardour.org/ardour/ardour into windows
|
2013-07-17 08:24:36 +01:00 |
|
|
|
7b480eaa27
|
Windows (compiler specific) includes for libpbd
|
2013-07-16 18:00:49 +01:00 |
|
|
|
15be154515
|
use g_unlink() rather than unlink() universally, requires <glib/gstdio.h> in several files
|
2013-07-15 14:29:00 -04:00 |
|
|
|
58a027b7a2
|
add copyright comments
git-svn-id: svn://localhost/ardour2/branches/3.0@13857 d708f5d6-7413-0410-9779-e7cbd77b26cf
|
2013-01-16 18:15:38 +00:00 |
|
|
|
5c17bd3df2
|
use Glib::build_filename() to construct fullpath, rather than doing it by hand (hello, windows)
git-svn-id: svn://localhost/ardour2/branches/3.0@7469 d708f5d6-7413-0410-9779-e7cbd77b26cf
|
2010-07-22 14:50:47 +00:00 |
|
|
|
c9b121803c
|
add new files
git-svn-id: svn://localhost/ardour2/branches/3.0@7427 d708f5d6-7413-0410-9779-e7cbd77b26cf
|
2010-07-16 15:45:24 +00:00 |
|
