Merge branch 'next' of git://gitorious.org/fg/simgear into next

diff --combined projects/VC100/SimGear.vcxproj
index 9e8d52268a1c70605a1100bdbd5cd56c88782f1f,1281e58a5a8487fd35f966ed5bd4e3f16f72f420..8729073beef7f2c7d21e38e9ba6aec6fb7f572b3
--- 1/projects/VC100/SimGear.vcxproj
--- 2/projects/VC100/SimGear.vcxproj
+++ b/projects/VC100/SimGear.vcxproj
@@@ -88,7 -88,7 +88,7 @@@
    </PropertyGroup>
    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
      <ClCompile>
 -      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
 +      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
        <AdditionalIncludeDirectories>..\..;..\..\simgear;..\..\..;..\..\..\install\msvc100\OpenSceneGraph\include;..\..\..\3rdparty\include;..\..\..\boost_1_43_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>HAVE_CONFIG_H;NDEBUG;WIN32;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
        <StringPooling>true</StringPooling>
@@@ -220,6 -220,8 +220,8 @@@
      <ClCompile Include="..\..\simgear\misc\tabbed_values.cxx" />
      <ClCompile Include="..\..\simgear\misc\texcoord.cxx" />
      <ClCompile Include="..\..\simgear\misc\zfstream.cxx" />
+     <ClCompile Include="..\..\simgear\misc\ResourceManager.cxx" />
+     <ClCompile Include="..\..\simgear\misc\ResourceManager.hxx" />
      <ClCompile Include="..\..\simgear\route\route.cxx" />
      <ClCompile Include="..\..\simgear\route\waypoint.cxx" />
      <ClCompile Include="..\..\simgear\screen\extensions.cxx" />