merge up to latest changes from callum and nat

2 files changed, 8 insertions, 0 deletions

diff --git a/indra/tools/vstool/VSTool.exe b/indra/tools/vstool/VSTool.exe
index 8be428614e..854290b90a 100755
--- a/indra/tools/vstool/VSTool.exe
+++ b/indra/tools/vstool/VSTool.exe
diff --git a/indra/tools/vstool/main.cs b/indra/tools/vstool/main.cs
index cc73261e30..ef2e582b90 100755
--- a/indra/tools/vstool/main.cs
+++ b/indra/tools/vstool/main.cs
@@ -555,6 +555,10 @@ namespace VSTool
                         version = "VC100";

                         break;

 

+                    case "12.00":

+                        version = "VC120";

+                        break;

+

                     default:

                         throw new ApplicationException("Unknown .sln version: " + format);

                 }

@@ -595,6 +599,10 @@ namespace VSTool
                     progid = "VisualStudio.DTE.10.0";

                     break;

 

+                case "VC120":

+                    progid = "VisualStudio.DTE.12.0";

+                    break;

+

                 default:

                     throw new ApplicationException("Can't handle VS version: " + version);

             }