Merge branch 'next' of git://github.com/jacek/imprudence into next

2 files changed, 8 insertions, 0 deletions

diff --git a/linden/indra/tools/vstool/VSTool.exe b/linden/indra/tools/vstool/VSTool.exe
index 6d1497d..ac1cf44 100755
--- a/linden/indra/tools/vstool/VSTool.exe
+++ b/linden/indra/tools/vstool/VSTool.exe
diff --git a/linden/indra/tools/vstool/main.cs b/linden/indra/tools/vstool/main.cs
index 5c41c91..4c33141 100644
--- a/linden/indra/tools/vstool/main.cs
+++ b/linden/indra/tools/vstool/main.cs
@@ -550,6 +550,10 @@ namespace VSTool
                     case "10.00":
                         version = "VC90";
                         break;
+
+                    case "11.00":
+                        version = "VC100";
+                        break;
                     default:
                         throw new ApplicationException("Unknown .sln version: " + format);
                 }
@@ -585,6 +589,10 @@ namespace VSTool
                 case "VC90":
                     progid = "VisualStudio.DTE.9.0";
                     break;
+
+                case "VC100":
+                    progid = "VisualStudio.DTE.10.0";
+                    break;
                 default:
                     throw new ApplicationException("Can't handle VS version: " + version);
             }