[sword-devel] branching status

[Chris Little]

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