Merge branch 'develop' into popup-control

This commit is contained in:
Alexander Eckart committed 2012-03-21 16:21:08 +01:00
commit faa7ebb964
17 files changed
+564 -392

No files matched your search

+12
View File
@@ -178,6 +178,18 @@
<B>0,300</B>
<A>1,000</A>
</LyricSubColor>
<TimeBar>
<R>0,800</R>
<G>0,950</G>
<B>1,000</B>
<A>0,500</A>
</TimeBar>
<TimeBarSentence>
<R>0,800</R>
<G>0,950</G>
<B>1,000</B>
<A>0,850</A>
</TimeBarSentence>
</ColorSchemes>
<Skins>
<BG_Default>[Red]BG_Default.png</BG_Default>