[NaCl SDK] move VSNaClSDKRoot into ConfigurationGeneral section

visual_studio/NativeClientVSAddIn/InstallerResources/PPAPI_Patch/Props/ppapi_general.xml.patch

Index: visual_studio/NativeClientVSAddIn/InstallerResources/PPAPI_Patch/Props/ppapi_general.xml.patch
diff --git a/visual_studio/NativeClientVSAddIn/InstallerResources/PPAPI_Patch/Props/ppapi_general.xml.patch b/visual_studio/NativeClientVSAddIn/InstallerResources/PPAPI_Patch/Props/ppapi_general.xml.patch
index a5c93ffb25ffdf6e740393fe605c1130275fb545..c2c00b201a1c6eb6df902ec99259e2f21b7cb31a 100644
--- a/visual_studio/NativeClientVSAddIn/InstallerResources/PPAPI_Patch/Props/ppapi_general.xml.patch
+++ b/visual_studio/NativeClientVSAddIn/InstallerResources/PPAPI_Patch/Props/ppapi_general.xml.patch
@@ -13,7 +13,7 @@
   <Rule.DataSource>
     <DataSource Persistence="ProjectFile" Label="Configuration" />
   </Rule.DataSource>
-  
+
   <!-- Add VS NaCl SDK Root.  Note the default value is actually set in Microsoft.cpp.PPAPI.default.props.patch -->
   <PatchAdd>
     <StringProperty Name="NaClAddInVersion" Visible="false"
@@ -22,16 +22,13 @@
         <DataSource Persistence="ProjectFile" Label=""/>
       </StringProperty.DataSource>
     </StringProperty>
-  
+
     <StringProperty Name="VSNaClSDKRoot" DisplayName="NaCl SDK Root"
                   Description="Specifies the path to the Native Client SDK root directory"
                   Category="NativeClient" Default=""
                   Subtype="folder" F1Keyword="VC.Project.VCConfiguration.NaClSDKRoot">
-      <StringProperty.DataSource>
-        <DataSource Persistence="ProjectFile" Label="" />
-      </StringProperty.DataSource>
     </StringProperty>
-    
+
     <StringProperty Name="NaClWebServerPort" DisplayName="Web Server Port"
                   Description="Specifies the port number to use while hosting the Pepper Plugin"
                   Category="NativeClient" Default=""
@@ -41,7 +38,7 @@
       </StringProperty.DataSource>
     </StringProperty>
   </PatchAdd>
-  
+
   <EnumProperty Name="ConfigurationType" DisplayName="Configuration Type"
                 Description="Specifies the type of output this configuration generates."
                 Category="ProjectDefaults"
@@ -58,4 +55,4 @@
       <EnumValue Name="StaticLibrary" DisplayName="Static library (.lib)" Description="Static Library (.lib)" />
     </PatchAdd>
   </EnumProperty>
-</Rule>
+</Rule>