2
0
mirror of https://github.com/hirschmann/nbfc synced 2025-08-31 14:15:28 +00:00

Merge branch 'master' into dev

Conflicts:
	NoteBookFanControl.sln
This commit is contained in:
Stefan Hirschmann
2013-12-04 15:04:06 +01:00
5 changed files with 16 additions and 12 deletions

View File

@@ -198,6 +198,8 @@ Global
{D709446B-7DEC-4F18-B2A2-638A2EF8AAA6}.Debug|x86.Build.0 = Debug|x86
{D709446B-7DEC-4F18-B2A2-638A2EF8AAA6}.Release Mono|Any CPU.ActiveCfg = Release|x86
{D709446B-7DEC-4F18-B2A2-638A2EF8AAA6}.Release Mono|Mixed Platforms.ActiveCfg = Release|x86
{D709446B-7DEC-4F18-B2A2-638A2EF8AAA6}.Release|Any CPU.ActiveCfg = Release|x86
{D709446B-7DEC-4F18-B2A2-638A2EF8AAA6}.Release|Any CPU.Build.0 = Release|x86
{D709446B-7DEC-4F18-B2A2-638A2EF8AAA6}.Release Mono|Mixed Platforms.Build.0 = Release|x86
{D709446B-7DEC-4F18-B2A2-638A2EF8AAA6}.Release Mono|x86.ActiveCfg = Release|x86
{D709446B-7DEC-4F18-B2A2-638A2EF8AAA6}.Release Mono|x86.Build.0 = Release|x86