| commit | bd23099909219397dfe6d12586f53c1d8e0a4108 | |
| author | sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224> | |
| Wed, 18 Nov 2009 15:55:27 +0000 (18 15:55 +0000) | ||
| committer | sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224> | |
| Wed, 18 Nov 2009 15:55:27 +0000 (18 15:55 +0000) | ||
| tree | 970d3ca3014d9ca45419fd78c7f91fcb2fd30144 | treesnapshot (tar.gz zip) |
| parent | 8c11fe9bf4215b6390b1572e71e7ad8accc152a8 | commitdiff |
| parent | 6a5b752a87fe6dd650410b5e3a5eb752ea4b84e9 | commitdiff |
Fix merge conflicts.
git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@3805 0c269be4-1314-0410-8aa9-9f06e86f4224
git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@3805 0c269be4-1314-0410-8aa9-9f06e86f4224