Florian Küpper 3721df81e7 Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop ...

Conflicts:
	Vocaluxe/Base/CGame.cs

2013-12-22 23:29:33 +01:00

..

Draw

Fix file headers and indentations

2013-09-20 18:09:32 +02:00

Game

Fix file headers and indentations

2013-09-20 18:09:32 +02:00

Menu

Merge branch 'develop' of https://github.com/Vocaluxe/Vocaluxe into develop

2013-12-22 23:18:38 +01:00

PartyModes

Fix file headers and indentations

2013-09-20 18:09:32 +02:00

Profile

Changed GuestProfile-option on profiles to UserRole. UserRole could now be set from Vocaluxe.

2013-12-19 08:54:27 +01:00

Properties

Fix file headers and indentations

2013-09-20 18:09:32 +02:00

Songs

Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop

2013-12-22 23:29:33 +01:00

CBasic.cs

Fix file headers and indentations

2013-09-20 18:09:32 +02:00

CHelper.cs

Merge branch 'release-0.3' into develop

2013-10-19 00:42:56 +02:00

CXMLReader.cs

Fix file headers and indentations

2013-09-20 18:09:32 +02:00

Enums.cs

Added screen for screen-adjustments.

2013-12-22 23:27:52 +01:00

Extensions.cs

Write decimals in international format

2013-10-14 21:55:26 +02:00

GlobalSuppressions.cs

Fix file headers and indentations

2013-09-20 18:09:32 +02:00

IBasic.cs

Added new background-option: SlideShow.

2013-12-19 08:50:45 +01:00

Settings.StyleCop

Added StyleCop Cleanups

2013-03-22 23:17:33 +01:00

Structs.cs

Fix file headers and indentations

2013-09-20 18:09:32 +02:00

VocaluxeLib.csproj

Fixed output directories

2013-12-19 13:19:42 +01:00