<div dir="ltr">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.<div>
<br></div><div>--Greg</div></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Sun, Dec 15, 2013 at 12:26 AM, Chris Little <span dir="ltr"><<a href="mailto:chrislit@crosswire.org" target="_blank">chrislit@crosswire.org</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="HOEnZb"><div class="h5">On 12/14/2013 11:14 AM, Greg Hellings wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Since the release of 1.7.0 there have been 3 commits to master:<br>
<br>
1) Normalizing licenses and properties, all are differences in comments<br>
2) Kostya's update to a locale<br>
3) A patch "Don't generate linebreaks for <lb type="x-optional"/>, which<br>
comes from USFM //.<br>
<br>
Are all three of these safe for me to pull into the 1-7-x maintenance<br>
branch? They appear to be, to me.<br>
<br>
--Greg<br>
</blockquote>
<br></div></div>
Yes, definitely.<br>
--Chris<br>
<br>
<br>
<br>
______________________________<u></u>_________________<br>
sword-devel mailing list: <a href="mailto:sword-devel@crosswire.org" target="_blank">sword-devel@crosswire.org</a><br>
<a href="http://www.crosswire.org/mailman/listinfo/sword-devel" target="_blank">http://www.crosswire.org/<u></u>mailman/listinfo/sword-devel</a><br>
Instructions to unsubscribe/change your settings at above page<br>
</blockquote></div><br></div>