Merge branch 'maint_1.8'

This commit is contained in:
Christoph Oelckers 2013-07-02 11:44:41 +02:00
commit b6cd38cded

View file

@ -111,15 +111,19 @@ Global
{087B206F-F49E-4EFB-92CB-E1F6E32D1278}.Debug|Win32.ActiveCfg = Debug|Win32
{087B206F-F49E-4EFB-92CB-E1F6E32D1278}.Debug|Win32.Build.0 = Debug|Win32
{087B206F-F49E-4EFB-92CB-E1F6E32D1278}.Debug|x64.ActiveCfg = Debug|Win32
{087B206F-F49E-4EFB-92CB-E1F6E32D1278}.Debug|x64.Build.0 = Debug|Win32
{087B206F-F49E-4EFB-92CB-E1F6E32D1278}.Release|Win32.ActiveCfg = Release|Win32
{087B206F-F49E-4EFB-92CB-E1F6E32D1278}.Release|Win32.Build.0 = Release|Win32
{087B206F-F49E-4EFB-92CB-E1F6E32D1278}.Release|x64.ActiveCfg = Release|Win32
{087B206F-F49E-4EFB-92CB-E1F6E32D1278}.Release|x64.Build.0 = Release|Win32
{31090871-A623-4BBC-A167-DE821CD1240C}.Debug|Win32.ActiveCfg = Debug|Win32
{31090871-A623-4BBC-A167-DE821CD1240C}.Debug|Win32.Build.0 = Debug|Win32
{31090871-A623-4BBC-A167-DE821CD1240C}.Debug|x64.ActiveCfg = Debug|Win32
{31090871-A623-4BBC-A167-DE821CD1240C}.Debug|x64.Build.0 = Debug|Win32
{31090871-A623-4BBC-A167-DE821CD1240C}.Release|Win32.ActiveCfg = Release|Win32
{31090871-A623-4BBC-A167-DE821CD1240C}.Release|Win32.Build.0 = Release|Win32
{31090871-A623-4BBC-A167-DE821CD1240C}.Release|x64.ActiveCfg = Release|Win32
{31090871-A623-4BBC-A167-DE821CD1240C}.Release|x64.Build.0 = Release|Win32
{6077B7D6-349F-4077-B552-3BC302EF5859}.Debug|Win32.ActiveCfg = Debug|Win32
{6077B7D6-349F-4077-B552-3BC302EF5859}.Debug|Win32.Build.0 = Debug|Win32
{6077B7D6-349F-4077-B552-3BC302EF5859}.Debug|x64.ActiveCfg = Debug|x64