Re: [HEADS UP] MERGE INTO MASTER! (was: Re: 1_0_0_b1_dev branches)

2016-11-10 Thread Christopher Collins
On Thu, Nov 10, 2016 at 08:04:45PM +, Sterling Hughes wrote: > just making sure people see this :) This is the final heads up :). I'll be merging develop into master shortly. For those who are interested in using the latest code, there is one major change you should know about prior to

Re: 1_0_0_b1_dev branches

2016-11-10 Thread Christopher Collins
FYI - I will be merging the develop branch into master later today. If you are using the master branch, and you are not prepared to switch over to the latest, then be careful with git pulls and newt syncs! Thanks, Chris On Thu, Nov 10, 2016 at 08:30:28AM -0800, Christopher Collins wrote: >

1_0_0_b1_dev branches

2016-11-10 Thread Christopher Collins
(changing subject to prevent mail from being categorized as a commit) On Thu, Nov 10, 2016 at 01:23:36PM +0100, Sterling Hughes wrote: > Is the idea to merge these from develop or master? > > I think we should probably merge develop->master now, prior to branching > anything. We should only be