merged from develop

2017-08-13 17:07:36 +02:00
parent ebda6babdd
commit ed553f5cae
398 changed files with 10399 additions and 2029 deletions
@@ -9,10 +9,9 @@ import time
 import urllib2

 import xbmc
-from core import config
 from core import filetools
 from core import jsontools
-from core import logger
+from platformcode import config, logger
 from platformcode import platformtools