On 04/21/2014 11:05 AM, Kornel Benko wrote:
Am Montag, 21. April 2014 um 11:01:39, schrieb Richard Heck
<rgh...@lyx.org>
> On 04/21/2014 10:38 AM, Jean-Marc Lasgouttes wrote:
> > Le 21/04/2014 16:34, Scott Kostyshak a écrit :
> >> I just committed to master because I thought it was open but I looked
> >> for a "master is open" email and did not find it. Did I make a
> >> mistake?
> >
> > I did that too, and began to wonder what is supposed to happen wrt
> > 2.2-staging. Who is going to cherry-pick what is there? When? In the
> > meantime, shall we commit to 2.2-staging or master?
> >
> > I see that master is version 2.2.0dev, so it is presumably open.
>
> I took it still to be closed, until 2.2-staging had been merged. I have
> a merged branch on my machine,
> with the two small conflicts fixed. Shall I push it?
+1
I mistakenly committed to master too ...
Let me wait a bit and see if we hear from Vincent.
Richard
