*addon - script.ambibox *version - 1.0.3 *url - https://github.com/AmbiBox/AmbiBox-XBMC.git *revision - 100b3f0fcbe86af510fcfadaea8031123819d930 *branch - master *xbmc version - gotham
Hi, Again, I apologize about that. I fixed the conflict. Thanks for pointing that out. Good lesson to learn - I need to look at the code on the github website even after I commit and get no error or warnings. Best, Ken -----Original Message----- From: sph...@dersphere.de [mailto:sph...@dersphere.de] On Behalf Of Tristan Fischer Sent: Tuesday, June 24, 2014 3:58 AM To: Ken Vives Cc: xbmc-addons Subject: Re: [Xbmc-addons] [Git Pull] script.ambibox minor revision You have a merge conflict in addon.xml. If you need help solving it reply me and I will create a pull request to your repo. regards, sphere 2014-06-23 17:48 GMT+02:00 Ken Vives <ken.vi...@gmail.com>: > I believe I have made the changes you requested... > > *addon - script.ambibox > *version - 1.0.3 > *url - https://github.com/AmbiBox/AmbiBox-XBMC.git > <http://s.bl-1.com/h/hvHWTxX> > *revision - 1ddf93625573dda27fc49e8d37305b411ecd3f35 > *branch - master > *xbmc version - gotham > > Thank you! > Best, > Ken > > > -----Original Message----- > From: sph...@dersphere.de [mailto:sph...@dersphere.de] On Behalf Of Tristan > Fischer > Sent: Monday, June 23, 2014 3:08 AM > To: Ken Vives > Cc: xbmc-addons > Subject: Re: [Xbmc-addons] [Git Pull] script.ambibox minor revision > > Hi, > > sorry for the delay! > - Icon needs to be 256x256px (your is 128x128) > - lanuage tag is missing (just add en empty tag in this case) > > regards, > sphere > > 2014-06-19 21:05 GMT+02:00 Ken Vives <ken.vi...@gmail.com>: >> Hello, >> >> Please consider this revision to my recently accepted script. >> >> >> >> *addon - script.ambibox >> >> *version - 1.0.2 >> >> *url - https://github.com/AmbiBox/AmbiBox-XBMC.git > <http://s.bl-1.com/h/hvHWTxX> >> >> *revision - c8d838b69cbfc452430a845b35cae675f848892a >> >> *branch - master >> >> *xbmc version - gotham >> >> >> >> Minor revision with a small bug fix, improved sensing of manually >> turning lights on and off and fixes a syntax warning re: import * from >> within a function. >> >> >> >> Thanks very much. >> >> I hope everyone is enjoying the World Cup. >> >> >> >> Ken >> >> >> ---------------------------------------------------------------------- >> -------- HPCC Systems Open Source Big Data Platform from LexisNexis >> Risk Solutions Find What Matters Most in Your Big Data with HPCC >> Systems Open Source. Fast. Scalable. Simple. Ideal for Dirty Data. >> Leverages Graph Analysis for Fast Processing & Easy Data Exploration >> http://p.sf.net/sfu/hpccsystems <http://s.bl-1.com/h/hvHWYLZ> >> _______________________________________________ >> Xbmc-addons mailing list >> Xbmc-addons@lists.sourceforge.net >> https://lists.sourceforge.net/lists/listinfo/xbmc-addons > <http://s.bl-1.com/h/hvHXfmc> >> > > ------------------------------------------------------------------------------ Open source business process management suite built on Java and Eclipse Turn processes into business applications with Bonita BPM Community Edition Quickly connect people, data, and systems into organized workflows Winner of BOSSIE, CODIE, OW2 and Gartner awards http://p.sf.net/sfu/Bonitasoft _______________________________________________ Xbmc-addons mailing list Xbmc-addons@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/xbmc-addons
