Hans Fugal
|
1f20fbbad8
|
merge from trunk
git-svn-id: svn://localhost/ardour2/branches/undo@802 d708f5d6-7413-0410-9779-e7cbd77b26cf
|
2006-08-12 21:57:07 +00:00 |
|
Hans Fugal
|
57f7f71ce3
|
r316@gandalf: fugalh | 2006-08-11 17:06:48 -0600
Reconstitution. Comiples, untested.
git-svn-id: svn://localhost/ardour2/branches/undo@797 d708f5d6-7413-0410-9779-e7cbd77b26cf
|
2006-08-12 21:49:20 +00:00 |
|
Hans Fugal
|
5756373841
|
Really fixed conflicts. Ready to merge into trunk.
git-svn-id: svn://localhost/ardour2/branches/undo@757 d708f5d6-7413-0410-9779-e7cbd77b26cf
|
2006-08-04 03:42:34 +00:00 |
|
Hans Fugal
|
79986643c0
|
r269@gandalf: fugalh | 2006-08-03 20:18:05 -0600
Trunk merge conflicts resolved
git-svn-id: svn://localhost/ardour2/branches/undo@756 d708f5d6-7413-0410-9779-e7cbd77b26cf
|
2006-08-04 02:18:45 +00:00 |
|