Merge remote-tracking branch 'origin/MP1-4826-Add_Ares_to_MP_repo' in…

…to MP1-4826-Add_Ares_to_MP_repo # Conflicts: # mediaportal/MediaPortal.Base/skin/Ares/Version.txt
MediaPortal · Dec 22, 2016 · 48faa13 · 48faa13
2 parents 30585a1 + 89db244
commit 48faa13
Show file tree

Hide file tree

Showing 1,689 changed files with 0 additions and 73,701 deletions.
diff --git a/mediaportal/MediaPortal.Base/skin/Ares/ALTERNATE mytvhomeServer.xml b/mediaportal/MediaPortal.Base/skin/Ares/ALTERNATE mytvhomeServer.xml
diff --git a/mediaportal/MediaPortal.Base/skin/Ares/BasicHome.xml b/mediaportal/MediaPortal.Base/skin/Ares/BasicHome.xml