You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@flex.apache.org by Justin Mclean <ju...@classsoftware.com> on 2014/12/16 08:11:01 UTC
Re: git commit: [flex-sdk] [refs/heads/release4.14.0] - Revert "Merge commit '1884960242f835879f5ca6504659072a2305f120' into release4.14.0"
Hi,
Looks liek this "revert" may of changed too much.
This is what I got when I just updated.
CONTRIBUTORS | 10 ++---
NOTICE | 4 ++
README | 41 ++++++++++-----------
RELEASE_NOTES | 87 ++++++++++++++++++++++----------------------
build.properties | 2 +-
build.xml | 3 +-
flex-sdk-description.xml | 4 +-
frameworks/build.xml | 3 --
frameworks/flex-config.xml | 2 +-
frameworks/projects/mobiletheme/defaults.css | 3 +-
ide/addAIRtoSDK.sh | 16 +-------
ide/checkAllPlayerGlobals.sh | 34 ++++++++---------
ide/flashbuilder/config/air-config.xml | 20 +++++-----
ide/flashbuilder/config/flex-config.xml | 22 +++++------
ide/setFlashPlayerVersion.sh | 30 +++------------
jenkins.xml | 32 +---------------
I don't think there should of been most of these changes. For example looks like the NOTICE file has OSMF text back in it.
Justin
Re: git commit: [flex-sdk] [refs/heads/release4.14.0] - Revert "Merge
commit '1884960242f835879f5ca6504659072a2305f120' into release4.14.0"
Posted by OmPrakash Muppirala <bi...@gmail.com>.
Thanks much!
Om
On Dec 16, 2014 12:49 AM, "Erik de Bruin" <er...@ixsoftware.nl> wrote:
> All done. I've also included the mobile skin fix as a bonus.
>
> The release branch should now be back in it's 'original' state, with a
> little detour along the way ;-)
>
> EdB
>
>
>
> On Tue, Dec 16, 2014 at 9:40 AM, Erik de Bruin <er...@ixsoftware.nl> wrote:
> > I'm on it. No worries... it was still Monday on your end ;-)
> >
> > EdB
> >
> >
> >
> > On Tue, Dec 16, 2014 at 9:33 AM, OmPrakash Muppirala
> > <bi...@gmail.com> wrote:
> >> Damn it, it's not my day. I have packed up for the night. Can someone
> >> else fix this, please?
> >>
> >> I am going to go hide in a hole in the meantime :-(
> >>
> >> Thanks,
> >> Om
> >> On Dec 15, 2014 11:42 PM, "Erik de Bruin" <er...@ixsoftware.nl> wrote:
> >>
> >>> I'm seeing the same thing :-) Looks like all changes to the 'release'
> >>> branch have been wiped out... Om?
> >>>
> >>> EdB
> >>>
> >>>
> >>>
> >>> On Tue, Dec 16, 2014 at 8:11 AM, Justin Mclean <
> justin@classsoftware.com>
> >>> wrote:
> >>> > Hi,
> >>> >
> >>> > Looks liek this "revert" may of changed too much.
> >>> >
> >>> > This is what I got when I just updated.
> >>> > CONTRIBUTORS | 10 ++---
> >>> > NOTICE | 4 ++
> >>> > README | 41
> ++++++++++-----------
> >>> > RELEASE_NOTES | 87
> >>> ++++++++++++++++++++++----------------------
> >>> > build.properties | 2 +-
> >>> > build.xml | 3 +-
> >>> > flex-sdk-description.xml | 4 +-
> >>> > frameworks/build.xml | 3 --
> >>> > frameworks/flex-config.xml | 2 +-
> >>> > frameworks/projects/mobiletheme/defaults.css | 3 +-
> >>> > ide/addAIRtoSDK.sh | 16 +-------
> >>> > ide/checkAllPlayerGlobals.sh | 34 ++++++++---------
> >>> > ide/flashbuilder/config/air-config.xml | 20 +++++-----
> >>> > ide/flashbuilder/config/flex-config.xml | 22 +++++------
> >>> > ide/setFlashPlayerVersion.sh | 30 +++------------
> >>> > jenkins.xml | 32 +---------------
> >>> >
> >>> > I don't think there should of been most of these changes. For
> example
> >>> looks like the NOTICE file has OSMF text back in it.
> >>> >
> >>> > Justin
> >>> >
> >>>
> >>>
> >>>
> >>> --
> >>> Ix Multimedia Software
> >>>
> >>> Jan Luykenstraat 27
> >>> 3521 VB Utrecht
> >>>
> >>> T. 06-51952295
> >>> I. www.ixsoftware.nl
> >>>
> >
> >
> >
> > --
> > Ix Multimedia Software
> >
> > Jan Luykenstraat 27
> > 3521 VB Utrecht
> >
> > T. 06-51952295
> > I. www.ixsoftware.nl
>
>
>
> --
> Ix Multimedia Software
>
> Jan Luykenstraat 27
> 3521 VB Utrecht
>
> T. 06-51952295
> I. www.ixsoftware.nl
>
Re: git commit: [flex-sdk] [refs/heads/release4.14.0] - Revert "Merge
commit '1884960242f835879f5ca6504659072a2305f120' into release4.14.0"
Posted by Erik de Bruin <er...@ixsoftware.nl>.
All done. I've also included the mobile skin fix as a bonus.
The release branch should now be back in it's 'original' state, with a
little detour along the way ;-)
EdB
On Tue, Dec 16, 2014 at 9:40 AM, Erik de Bruin <er...@ixsoftware.nl> wrote:
> I'm on it. No worries... it was still Monday on your end ;-)
>
> EdB
>
>
>
> On Tue, Dec 16, 2014 at 9:33 AM, OmPrakash Muppirala
> <bi...@gmail.com> wrote:
>> Damn it, it's not my day. I have packed up for the night. Can someone
>> else fix this, please?
>>
>> I am going to go hide in a hole in the meantime :-(
>>
>> Thanks,
>> Om
>> On Dec 15, 2014 11:42 PM, "Erik de Bruin" <er...@ixsoftware.nl> wrote:
>>
>>> I'm seeing the same thing :-) Looks like all changes to the 'release'
>>> branch have been wiped out... Om?
>>>
>>> EdB
>>>
>>>
>>>
>>> On Tue, Dec 16, 2014 at 8:11 AM, Justin Mclean <ju...@classsoftware.com>
>>> wrote:
>>> > Hi,
>>> >
>>> > Looks liek this "revert" may of changed too much.
>>> >
>>> > This is what I got when I just updated.
>>> > CONTRIBUTORS | 10 ++---
>>> > NOTICE | 4 ++
>>> > README | 41 ++++++++++-----------
>>> > RELEASE_NOTES | 87
>>> ++++++++++++++++++++++----------------------
>>> > build.properties | 2 +-
>>> > build.xml | 3 +-
>>> > flex-sdk-description.xml | 4 +-
>>> > frameworks/build.xml | 3 --
>>> > frameworks/flex-config.xml | 2 +-
>>> > frameworks/projects/mobiletheme/defaults.css | 3 +-
>>> > ide/addAIRtoSDK.sh | 16 +-------
>>> > ide/checkAllPlayerGlobals.sh | 34 ++++++++---------
>>> > ide/flashbuilder/config/air-config.xml | 20 +++++-----
>>> > ide/flashbuilder/config/flex-config.xml | 22 +++++------
>>> > ide/setFlashPlayerVersion.sh | 30 +++------------
>>> > jenkins.xml | 32 +---------------
>>> >
>>> > I don't think there should of been most of these changes. For example
>>> looks like the NOTICE file has OSMF text back in it.
>>> >
>>> > Justin
>>> >
>>>
>>>
>>>
>>> --
>>> Ix Multimedia Software
>>>
>>> Jan Luykenstraat 27
>>> 3521 VB Utrecht
>>>
>>> T. 06-51952295
>>> I. www.ixsoftware.nl
>>>
>
>
>
> --
> Ix Multimedia Software
>
> Jan Luykenstraat 27
> 3521 VB Utrecht
>
> T. 06-51952295
> I. www.ixsoftware.nl
--
Ix Multimedia Software
Jan Luykenstraat 27
3521 VB Utrecht
T. 06-51952295
I. www.ixsoftware.nl
Re: git commit: [flex-sdk] [refs/heads/release4.14.0] - Revert "Merge
commit '1884960242f835879f5ca6504659072a2305f120' into release4.14.0"
Posted by Erik de Bruin <er...@ixsoftware.nl>.
I'm on it. No worries... it was still Monday on your end ;-)
EdB
On Tue, Dec 16, 2014 at 9:33 AM, OmPrakash Muppirala
<bi...@gmail.com> wrote:
> Damn it, it's not my day. I have packed up for the night. Can someone
> else fix this, please?
>
> I am going to go hide in a hole in the meantime :-(
>
> Thanks,
> Om
> On Dec 15, 2014 11:42 PM, "Erik de Bruin" <er...@ixsoftware.nl> wrote:
>
>> I'm seeing the same thing :-) Looks like all changes to the 'release'
>> branch have been wiped out... Om?
>>
>> EdB
>>
>>
>>
>> On Tue, Dec 16, 2014 at 8:11 AM, Justin Mclean <ju...@classsoftware.com>
>> wrote:
>> > Hi,
>> >
>> > Looks liek this "revert" may of changed too much.
>> >
>> > This is what I got when I just updated.
>> > CONTRIBUTORS | 10 ++---
>> > NOTICE | 4 ++
>> > README | 41 ++++++++++-----------
>> > RELEASE_NOTES | 87
>> ++++++++++++++++++++++----------------------
>> > build.properties | 2 +-
>> > build.xml | 3 +-
>> > flex-sdk-description.xml | 4 +-
>> > frameworks/build.xml | 3 --
>> > frameworks/flex-config.xml | 2 +-
>> > frameworks/projects/mobiletheme/defaults.css | 3 +-
>> > ide/addAIRtoSDK.sh | 16 +-------
>> > ide/checkAllPlayerGlobals.sh | 34 ++++++++---------
>> > ide/flashbuilder/config/air-config.xml | 20 +++++-----
>> > ide/flashbuilder/config/flex-config.xml | 22 +++++------
>> > ide/setFlashPlayerVersion.sh | 30 +++------------
>> > jenkins.xml | 32 +---------------
>> >
>> > I don't think there should of been most of these changes. For example
>> looks like the NOTICE file has OSMF text back in it.
>> >
>> > Justin
>> >
>>
>>
>>
>> --
>> Ix Multimedia Software
>>
>> Jan Luykenstraat 27
>> 3521 VB Utrecht
>>
>> T. 06-51952295
>> I. www.ixsoftware.nl
>>
--
Ix Multimedia Software
Jan Luykenstraat 27
3521 VB Utrecht
T. 06-51952295
I. www.ixsoftware.nl
Re: git commit: [flex-sdk] [refs/heads/release4.14.0] - Revert "Merge
commit '1884960242f835879f5ca6504659072a2305f120' into release4.14.0"
Posted by OmPrakash Muppirala <bi...@gmail.com>.
Damn it, it's not my day. I have packed up for the night. Can someone
else fix this, please?
I am going to go hide in a hole in the meantime :-(
Thanks,
Om
On Dec 15, 2014 11:42 PM, "Erik de Bruin" <er...@ixsoftware.nl> wrote:
> I'm seeing the same thing :-) Looks like all changes to the 'release'
> branch have been wiped out... Om?
>
> EdB
>
>
>
> On Tue, Dec 16, 2014 at 8:11 AM, Justin Mclean <ju...@classsoftware.com>
> wrote:
> > Hi,
> >
> > Looks liek this "revert" may of changed too much.
> >
> > This is what I got when I just updated.
> > CONTRIBUTORS | 10 ++---
> > NOTICE | 4 ++
> > README | 41 ++++++++++-----------
> > RELEASE_NOTES | 87
> ++++++++++++++++++++++----------------------
> > build.properties | 2 +-
> > build.xml | 3 +-
> > flex-sdk-description.xml | 4 +-
> > frameworks/build.xml | 3 --
> > frameworks/flex-config.xml | 2 +-
> > frameworks/projects/mobiletheme/defaults.css | 3 +-
> > ide/addAIRtoSDK.sh | 16 +-------
> > ide/checkAllPlayerGlobals.sh | 34 ++++++++---------
> > ide/flashbuilder/config/air-config.xml | 20 +++++-----
> > ide/flashbuilder/config/flex-config.xml | 22 +++++------
> > ide/setFlashPlayerVersion.sh | 30 +++------------
> > jenkins.xml | 32 +---------------
> >
> > I don't think there should of been most of these changes. For example
> looks like the NOTICE file has OSMF text back in it.
> >
> > Justin
> >
>
>
>
> --
> Ix Multimedia Software
>
> Jan Luykenstraat 27
> 3521 VB Utrecht
>
> T. 06-51952295
> I. www.ixsoftware.nl
>
Re: git commit: [flex-sdk] [refs/heads/release4.14.0] - Revert "Merge
commit '1884960242f835879f5ca6504659072a2305f120' into release4.14.0"
Posted by Erik de Bruin <er...@ixsoftware.nl>.
I'm seeing the same thing :-) Looks like all changes to the 'release'
branch have been wiped out... Om?
EdB
On Tue, Dec 16, 2014 at 8:11 AM, Justin Mclean <ju...@classsoftware.com> wrote:
> Hi,
>
> Looks liek this "revert" may of changed too much.
>
> This is what I got when I just updated.
> CONTRIBUTORS | 10 ++---
> NOTICE | 4 ++
> README | 41 ++++++++++-----------
> RELEASE_NOTES | 87 ++++++++++++++++++++++----------------------
> build.properties | 2 +-
> build.xml | 3 +-
> flex-sdk-description.xml | 4 +-
> frameworks/build.xml | 3 --
> frameworks/flex-config.xml | 2 +-
> frameworks/projects/mobiletheme/defaults.css | 3 +-
> ide/addAIRtoSDK.sh | 16 +-------
> ide/checkAllPlayerGlobals.sh | 34 ++++++++---------
> ide/flashbuilder/config/air-config.xml | 20 +++++-----
> ide/flashbuilder/config/flex-config.xml | 22 +++++------
> ide/setFlashPlayerVersion.sh | 30 +++------------
> jenkins.xml | 32 +---------------
>
> I don't think there should of been most of these changes. For example looks like the NOTICE file has OSMF text back in it.
>
> Justin
>
--
Ix Multimedia Software
Jan Luykenstraat 27
3521 VB Utrecht
T. 06-51952295
I. www.ixsoftware.nl