No rush, just making sure we're not forgetting about branch fixes. Good luck with Mustella.
On 16 December 2014 at 17:48, Erik de Bruin <e...@ixsoftware.nl> wrote: > Yes, I will. But we're focussing on 4.14 release now, so I'm not > putting time in to do that if there are other things that need doin'. > Currently the Mustella jobs are having difficulties, that's keeping me > pretty busy :-( > > EdB > > > > On Tue, Dec 16, 2014 at 6:06 PM, Mihai Chira <mihai.ch...@gmail.com> wrote: >> Will we merge this back onto develop? >> >> On 16 December 2014 at 15:51, <aha...@apache.org> wrote: >>> Repository: flex-sdk >>> Updated Branches: >>> refs/heads/release4.14.0 19a8576d5 -> dafcb3c70 >>> >>> >>> add cachefile for osmf >>> >>> >>> Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo >>> Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/dafcb3c7 >>> Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/dafcb3c7 >>> Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/dafcb3c7 >>> >>> Branch: refs/heads/release4.14.0 >>> Commit: dafcb3c704f9fc1924b5709a58e0979d31ffd6fd >>> Parents: 19a8576 >>> Author: Alex Harui <aha...@apache.org> >>> Authored: Tue Dec 16 07:50:26 2014 -0800 >>> Committer: Alex Harui <aha...@apache.org> >>> Committed: Tue Dec 16 07:51:10 2014 -0800 >>> >>> ---------------------------------------------------------------------- >>> installer.xml | 2 ++ >>> 1 file changed, 2 insertions(+) >>> ---------------------------------------------------------------------- >>> >>> >>> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/dafcb3c7/installer.xml >>> ---------------------------------------------------------------------- >>> diff --git a/installer.xml b/installer.xml >>> index 1440655..8dc9289 100644 >>> --- a/installer.xml >>> +++ b/installer.xml >>> @@ -63,6 +63,7 @@ >>> <property name="osmf.url.server" >>> value="http://downloads.sourceforge.net"; /> >>> <property name="osmf.url.folder" >>> value="project/osmf.adobe/OSMF%202.0%20Release%20%28final%20source%2C%20ASDocs%2C%20pdf%20guides%20and%20release%20notes%29" >>> /> >>> <property name="osmf.url.file" value="OSMF.swc" /> >>> + <property name="osmf.url.cachefile" value="OSMF.swc" /> >>> <property name="osmf.url.md5" value="6385228692ab982630e47422403f6890" >>> /> >>> >>> <property name="afe.url.server" value="https://sourceforge.net"; /> >>> @@ -665,6 +666,7 @@ >>> <param name="srcDomain" value="${osmf.url.server}" /> >>> <param name="srcFolder" value="${osmf.url.folder}" /> >>> <param name="srcFile" value="${osmf.url.file}" /> >>> + <param name="cacheFile" value="${osmf.url.cachefile}" /> >>> <param name="dest" value="${basedir}/frameworks/libs/osmf.swc" >>> /> >>> <param name="failmessage" value="OSMF download >>> failed" /> >>> <param name="md5" value="${osmf.url.md5}" /> >>> > > > > -- > Ix Multimedia Software > > Jan Luykenstraat 27 > 3521 VB Utrecht > > T. 06-51952295 > I. www.ixsoftware.nl
