Re: [O] Merge 9.0.5 to emacs master?

2017-04-18 Thread Kaushal Modi
On Mon, Feb 13, 2017, 1:40 PM Kyle Meyer wrote: > Rasmus writes: > > [...] > > > I think we have discussed it before, but the best way seems to just copy > > the Org tree to the Emacs tree, right? > > Given the current setup, I think copying the files is best.

Re: [O] Merge 9.0.5 to emacs master?

2017-02-13 Thread Kyle Meyer
Rasmus writes: [...] > I think we have discussed it before, but the best way seems to just copy > the Org tree to the Emacs tree, right? Given the current setup, I think copying the files is best. I've already resolved the conflicts when backporting Org-related commits from the

Re: [O] Merge 9.0.5 to emacs master?

2017-02-13 Thread Rasmus
Kyle Meyer writes: > Hi Bastien, > > Bastien Guerry writes: > >> Kyle Meyer writes: >> >>> Kaushal Modi writes: >>> Kyle -- Would this be a good time to start the merge to emacs master? >>> From my standpoint,

Re: [O] Merge 9.0.5 to emacs master?

2017-02-13 Thread Kyle Meyer
Hi Bastien, Bastien Guerry writes: > Kyle Meyer writes: > >> Kaushal Modi writes: >> >>> Kyle -- Would this be a good time to start the merge to emacs master? >> >>>From my standpoint, that'd be fine. I'm not aware of any outstanding >>

Re: [O] Merge 9.0.5 to emacs master?

2017-02-13 Thread Bastien Guerry
Hi Kyle, Kyle Meyer writes: > Kaushal Modi writes: > >> Kyle -- Would this be a good time to start the merge to emacs master? > >>From my standpoint, that'd be fine. I'm not aware of any outstanding > patches that need to be backported from the Emacs

Re: [O] Merge 9.0.5 to emacs master? (Was: Release 9.0.5)

2017-02-12 Thread Kyle Meyer
Kaushal Modi writes: > Kyle -- Would this be a good time to start the merge to emacs master? >From my standpoint, that'd be fine. I'm not aware of any outstanding patches that need to be backported from the Emacs repo. -- Kyle