Merge branch 'develop' of git://github.com/KoMaDoctors/Vocaluxe into SongListView
Conflicts: Vocaluxe/Base/CConfig.cs VocaluxeLib/Menu/SongMenu/CSongMenu.cs
This commit is contained in:
commit
20b2e735ec
5 files changed
+664
-5
No files matched your search
@@ -200,10 +200,10 @@ namespace VocaluxeLib
|
||||
public enum ESongMenu
|
||||
{
|
||||
// ReSharper disable InconsistentNaming
|
||||
//TR_CONFIG_LIST, //a simple list
|
||||
//TR_CONFIG_DREIDEL, //as in ultrastar deluxe
|
||||
TR_CONFIG_LIST, // list of covers and artist - title
|
||||
//TR_CONFIG_DREIDEL, //as in ultrastar deluxe
|
||||
TR_CONFIG_TILE_BOARD, //chessboard like
|
||||
//TR_CONFIG_BOOK //for playlists
|
||||
//TR_CONFIG_BOOK //for playlists
|
||||
// ReSharper restore InconsistentNaming
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user