[sword-devel] branching status

[Greg Hellings]

Hmm, I thought I had been given write permissions to that branch but it
appears I haven't. Either someone else will need to merge those over or
I'll need Troy to give me write access to the sword-1-7-x branch.

--Greg


On Sun, Dec 15, 2013 at 12:26 AM, Chris Little <chrislit at crosswire.org>wrote:

> On 12/14/2013 11:14 AM, Greg Hellings wrote:
>
>> Since the release of 1.7.0 there have been 3 commits to master:
>>
>> 1) Normalizing licenses and properties, all are differences in comments
>> 2) Kostya's update to a locale
>> 3) A patch "Don't generate linebreaks for <lb type="x-optional"/>, which
>> comes from USFM //.
>>
>> Are all three of these safe for me to pull into the 1-7-x maintenance
>> branch? They appear to be, to me.
>>
>> --Greg
>>
>
> Yes, definitely.
> --Chris
>
>
>
> _______________________________________________
> sword-devel mailing list: sword-devel at crosswire.org
> http://www.crosswire.org/mailman/listinfo/sword-devel
> Instructions to unsubscribe/change your settings at above page
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.crosswire.org/pipermail/sword-devel/attachments/20131227/5d8a965b/attachment.html>