cordova-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jesse <purplecabb...@gmail.com>
Subject Re: CB-4900 device-orientation windows8 code review?
Date Wed, 25 Sep 2013 18:30:10 GMT
ugh, done ...

@purplecabbage
risingj.com


On Wed, Sep 25, 2013 at 11:18 AM, Carlos Santana <csantana23@gmail.com>wrote:

> Jesse your commit left from conflict markers in at the top
>
> <<<<<<< HEAD
> /*
> =======
> cordova.define("org.apache.cordova.device-orientation.CompassProxy",
> function(require, exports, module) {/*
> >>>>>>> d863af77758d0d58f4bdb71cc0ba2f30b9d24228
>
>
> Please review mine:
> https://github.com/apache/cordova-plugin-device-orientation/pull/3
>
>
>
> On Wed, Sep 25, 2013 at 1:54 PM, Jesse <purplecabbage@gmail.com> wrote:
>
> >
> >
> https://git-wip-us.apache.org/repos/asf?p=cordova-plugin-device-orientation.git;a=commit;h=9d32a18404d5fefb609f4e844f955be426b6773d
> >
> > @purplecabbage
> > risingj.com
> >
> >
> > On Wed, Sep 25, 2013 at 10:47 AM, Carlos Santana <csantana23@gmail.com
> > >wrote:
> >
> > > will do
> > >
> > >
> > >
> > > On Wed, Sep 25, 2013 at 1:40 PM, Jesse <purplecabbage@gmail.com>
> wrote:
> > >
> > > > It's good, I'd pull it in, but there are merge issues.
> > > > Can you update to include the latest commits to the dev branch?
> > > >
> > > > @purplecabbage
> > > > risingj.com
> > > >
> > > >
> > > > On Wed, Sep 25, 2013 at 10:12 AM, Carlos Santana <
> csantana23@gmail.com
> > > > >wrote:
> > > >
> > > > > Can someone review this proposed fix and if OK merge into dev?
> > > > >
> > > > > Windows 8 Compass plugin have extra define breaks plugin loading:
> > > > >
> > > > > https://issues.apache.org/jira/browse/CB-4900
> > > > >
> > > > > https://github.com/apache/cordova-plugin-device-orientation/pull/3
> > > > >
> > > > > --
> > > > > Carlos Santana
> > > > > <csantana23@gmail.com>
> > > > >
> > > >
> > >
> > >
> > >
> > > --
> > > Carlos Santana
> > > <csantana23@gmail.com>
> > >
> >
>
>
>
> --
> Carlos Santana
> <csantana23@gmail.com>
>

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message