Author: cnauroth
Date: Mon Oct 14 17:43:06 2013
New Revision: 1531994
URL: http://svn.apache.org/r1531994
Log:
HADOOP-10040. Correct merge error on native.vcxproj. Contributed by Chris
Nauroth.
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/native.vcxproj
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/native.vcxproj
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/native.vcxproj?rev=1531994&r1=1531993&r2=1531994&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/native.vcxproj
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/native/native.vcxproj
Mon Oct 14 17:43:06 2013
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
@@ -93,7 +93,6 @@
<AdditionalOptions>/D
HADOOP_SNAPPY_LIBRARY=L\"snappy.dll\"</AdditionalOptions>
</ClCompile>
<ClCompile Include="src\org\apache\hadoop\io\compress\lz4\lz4.c" />
- <ClCompile Include="src\org\apache\hadoop\io\compress\lz4\lz4hc.c" />
<ClCompile Include="src\org\apache\hadoop\io\compress\lz4\Lz4Compressor.c"
/>
<ClCompile
Include="src\org\apache\hadoop\io\compress\lz4\Lz4Decompressor.c" />
<ClCompile Include="src\org\apache\hadoop\io\nativeio\file_descriptor.c" />
