Merge remote-tracking branch 'upstream/develop' into medley

This commit is contained in:
Florian Kuepper committed 2012-06-17 13:37:48 +02:00
commit 3616774bb2
23 files changed
+1003 -248

No files matched your search

@@ -0,0 +1,17 @@
ScreenOptionsSound
++++++++++
Version 1:
Add:
<ButtonExit>
<SelectSlideLyricStyle>
<SelectSlideLyricsOnTop>
and some texts for description (Text1, Text2, Text3)
TR_SCREENOLYRICS_OPTIONS
TR_SCREENOLYRICS_STYLE
TR_SCREENOLYRICS_ONTOP
++++++++++