Merge remote-tracking branch 'remotes/origin/BUG-4242-Sudoku_and_Tetr…

…is_Titan'
MediaPortal · Feb 22, 2013 · cbd5c8e · cbd5c8e
2 parents 41ece3c + a68ebff
commit cbd5c8e
Show file tree

Hide file tree

Showing 19 changed files with 1,642 additions and 1,740 deletions.
diff --git a/mediaportal/MediaPortal.Base/skin/Titan/Media/Tetris/background.png b/mediaportal/MediaPortal.Base/skin/Titan/Media/Tetris/background.png
diff --git a/mediaportal/MediaPortal.Base/skin/Titan/Media/Tetris/background_focus.png b/mediaportal/MediaPortal.Base/skin/Titan/Media/Tetris/background_focus.png
diff --git a/mediaportal/MediaPortal.Base/skin/Titan/Media/Tetris/block_bg.png b/mediaportal/MediaPortal.Base/skin/Titan/Media/Tetris/block_bg.png
diff --git a/mediaportal/MediaPortal.Base/skin/Titan/Media/Tetris/button_focus_toggleoff.png b/mediaportal/MediaPortal.Base/skin/Titan/Media/Tetris/button_focus_toggleoff.png
diff --git a/mediaportal/MediaPortal.Base/skin/Titan/Media/Tetris/button_focus_toggleon.png b/mediaportal/MediaPortal.Base/skin/Titan/Media/Tetris/button_focus_toggleon.png
diff --git a/mediaportal/MediaPortal.Base/skin/Titan/Media/Tetris/button_nofocus_toggleoff.png b/mediaportal/MediaPortal.Base/skin/Titan/Media/Tetris/button_nofocus_toggleoff.png
diff --git a/mediaportal/MediaPortal.Base/skin/Titan/Media/Tetris/button_nofocus_toggleon.png b/mediaportal/MediaPortal.Base/skin/Titan/Media/Tetris/button_nofocus_toggleon.png
diff --git a/mediaportal/MediaPortal.Base/skin/Titan/Media/Tetris/button_texture.png b/mediaportal/MediaPortal.Base/skin/Titan/Media/Tetris/button_texture.png
diff --git a/mediaportal/MediaPortal.Base/skin/Titan/Media/Tetris/button_texture_focus.png b/mediaportal/MediaPortal.Base/skin/Titan/Media/Tetris/button_texture_focus.png
diff --git a/mediaportal/MediaPortal.Base/skin/Titan/Media/bar_hor.png b/mediaportal/MediaPortal.Base/skin/Titan/Media/bar_hor.png
diff --git a/mediaportal/MediaPortal.Base/skin/Titan/Media/bar_vert.png b/mediaportal/MediaPortal.Base/skin/Titan/Media/bar_vert.png
diff --git a/mediaportal/MediaPortal.Base/skin/Titan/Media/hover_mynumberplace.png b/mediaportal/MediaPortal.Base/skin/Titan/Media/hover_mynumberplace.png
diff --git a/mediaportal/MediaPortal.Base/skin/Titan/Media/icon_empty_focus.png b/mediaportal/MediaPortal.Base/skin/Titan/Media/icon_empty_focus.png
diff --git a/mediaportal/MediaPortal.Base/skin/Titan/Media/icon_empty_nofocus.png b/mediaportal/MediaPortal.Base/skin/Titan/Media/icon_empty_nofocus.png
diff --git a/mediaportal/MediaPortal.Base/skin/Titan/Media/mynumberplace_score_bg.png b/mediaportal/MediaPortal.Base/skin/Titan/Media/mynumberplace_score_bg.png
diff --git a/mediaportal/MediaPortal.Base/skin/Titan/Media/panel_weather2.png b/mediaportal/MediaPortal.Base/skin/Titan/Media/panel_weather2.png
diff --git a/mediaportal/MediaPortal.Base/skin/Titan/fonts.xml b/mediaportal/MediaPortal.Base/skin/Titan/fonts.xml
@@ -166,4 +166,8 @@
 	<end>1536</end>
 	<bold>no</bold>
 </font>
+<alias>
+  <name>font18</name>
+  <fontname>font22</fontname>
+</alias>
 </fonts>