Finished fixing bugs caused by the merge

2014-06-10 16:29:52 -04:00
parent 1d6ea166c1
commit f18ae9892a
8 changed files with 134 additions and 320 deletions
--- a/src/common/common.vcxproj
+++ b/src/common/common.vcxproj
@@ -219,7 +219,11 @@
  <ItemGroup>
    <Text Include="CMakeLists.txt" />
  </ItemGroup>
+  <ItemGroup>
+    <None Include="scm_rev.cpp.in" />
+    <None Include="scm_rev_gen.js" />
+  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
-</Project>
+</Project>