Merge pull request #9235 from phil65/bye_bye_confluence_was_nice_to_m…

…eet_you New clothes for Kodi
xbmc · Mar 1, 2016 · 034aa80 · 034aa80
2 parents 06c7b61 + 16e0c92
commit 034aa80
Show file tree

Hide file tree

Showing 1,526 changed files with 22,674 additions and 70,058 deletions.
diff --git a/.gitignore b/.gitignore
@@ -114,8 +114,8 @@ cmake_install.cmake
 
 # /addons/
 /addons/packages
-/addons/skin.confluence/media/Makefile
-/addons/skin.confluence/media/Textures.xbt
+/addons/skin.estuary/media/Makefile
+/addons/skin.estuary/media/*.xbt
 /addons/skin.pm3-hd/media/Textures.xbt
 /addons/visualization.itunes/iTunes.mvis
 /addons/script.module.pil/

diff --git a/Makefile.in b/Makefile.in
@@ -196,8 +196,8 @@ LIBADDON_DIRS=\
 	lib/addons/library.xbmc.pvr \
 	lib/addons/library.kodi.guilib \
 
-CONFLUENCE_MEDIA=addons/skin.confluence/media
-SKIN_DIRS=$(CONFLUENCE_MEDIA)
+ESTUARY_MEDIA=addons/skin.estuary/media
+SKIN_DIRS=$(ESTUARY_MEDIA)
 
 ifeq (@USE_TOUCH_SKIN@,1)
 TOUCH_SKIN_MEDIA=addons/skin.re-touched/media
@@ -283,7 +283,7 @@ config.status: configure
 # skin textures
 ifeq (@USE_TEXTUREPACKER@,1)
 skins: @TEXTUREPACKER@
-	 $(MAKE) -C $(CONFLUENCE_MEDIA)
+	 $(MAKE) -C $(ESTUARY_MEDIA)
 ifeq (@USE_TOUCH_SKIN@,1)
 	 $(MAKE) -C $(TOUCH_SKIN_MEDIA)
 endif