Re: jackd repo merged

2010-04-29 Thread Adrian Knoth
On Thu, Apr 29, 2010 at 04:54:43PM +0200, Jonas Smedegaard wrote: >> I had jackd1 in master/upstream and jackd2 in >> master.jackd2/upstream.jackd2. Given that we want to re-introduce >> jackd1, it might be a good idea to fix this (if possible). OTOH, we >> could create a dedicated jackd1 re

Re: jackd repo merged

2010-04-29 Thread Jonas Smedegaard
Hi Adrian, On Thu, Apr 29, 2010 at 04:18:54PM +0200, Adrian Knoth wrote: It looks like the branches in our jackd repo have been merged. Was this intended? Yes, it was intended. Once upon a time (some weeks ago) we decided to switch from jackd1 to jackd2, without looking back, i.e. treating

jackd repo merged

2010-04-29 Thread Adrian Knoth
Hi! It looks like the branches in our jackd repo have been merged. Was this intended? I had jackd1 in master/upstream and jackd2 in master.jackd2/upstream.jackd2. Given that we want to re-introduce jackd1, it might be a good idea to fix this (if possible). OTOH, we could create a dedicated jackd1