2016-11-29, 00:41
A little of both. The original plan was to have igConq be the 'upstream' of the OSMC skin, but in the end there were so many minor changes that it got to the point where changes from one couldn't be easily moved to the other. By rebasing on top of the OSMC skin (so OSMC becomes the 'upstream' of igConq), it allows fixes and improvements to be shared which does make the maintenance of both so much easier. But there are also a lot of little changes in the OSMC skin that I do indeed like - now playing information, media flags and updated dialog appearance to name just three - that I'm happy to have in my day-to-day skin.
