ugh, done ... @purplecabbage risingj.com
On Wed, Sep 25, 2013 at 11:18 AM, Carlos Santana <[email protected]>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 <[email protected]> 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 <[email protected] > > >wrote: > > > > > will do > > > > > > > > > > > > On Wed, Sep 25, 2013 at 1:40 PM, Jesse <[email protected]> > 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 < > [email protected] > > > > >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 > > > > > <[email protected]> > > > > > > > > > > > > > > > > > > > > > -- > > > Carlos Santana > > > <[email protected]> > > > > > > > > > -- > Carlos Santana > <[email protected]> >
